Merge "msm: Camera buffer overflow fix" (e698c6ee) · Commits · e / devices / android_kernel_sony_msm8998

drivers/media/platform/msm/camera_v2/camera/camera.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -538,7 +538,7 @@ static int camera_v4l2_fh_open(struct file *filep)
		{
		struct msm_video_device *pvdev = video_drvdata(filep);
		struct camera_v4l2_private *sp;
		unsigned int stream_id;
		unsigned long stream_id;

		sp = kzalloc(sizeof(*sp), GFP_KERNEL);
		if (!sp) {
		@@ -617,7 +617,7 @@ static int camera_v4l2_open(struct file *filep)
		int rc = 0;
		struct v4l2_event event;
		struct msm_video_device *pvdev = video_drvdata(filep);
		unsigned int opn_idx, idx;
		unsigned long opn_idx, idx;
		BUG_ON(!pvdev);

		rc = camera_v4l2_fh_open(filep);