Merge "msm: camera: Allow driver file to be opend only once."

author Linux Build Service Account <lnxbuild@quicinc.com>

Thu, 4 May 2017 06:32:09 +0000 (23:32 -0700)

committer Gerrit - the friendly Code Review server <code-review@localhost>

Thu, 4 May 2017 06:32:08 +0000 (23:32 -0700)
author Linux Build Service Account <lnxbuild@quicinc.com>
Thu, 4 May 2017 06:32:09 +0000 (23:32 -0700)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Thu, 4 May 2017 06:32:08 +0000 (23:32 -0700)
diff --cc drivers/media/platform/msm/camera_v2/msm.c
Simple merge
author	Linux Build Service Account <lnxbuild@quicinc.com>
	Thu, 4 May 2017 06:32:09 +0000 (23:32 -0700)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Thu, 4 May 2017 06:32:08 +0000 (23:32 -0700)