Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 (bec41d5b) · Commits · e / devices / android_kernel_sony_msm8998

drivers/media/video/soc_camera.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -405,13 +405,13 @@ static int soc_camera_open(struct file *file)
	ret = soc_camera_set_fmt(icd, &f);		ret = soc_camera_set_fmt(icd, &f);
	if (ret < 0)		if (ret < 0)
	goto esfmt;		goto esfmt;

			ici->ops->init_videobuf(&icd->vb_vidq, icd);
	}		}

	file->private_data = icd;		file->private_data = icd;
	dev_dbg(&icd->dev, "camera device open\n");		dev_dbg(&icd->dev, "camera device open\n");

	ici->ops->init_videobuf(&icd->vb_vidq, icd);

	mutex_unlock(&icd->video_lock);		mutex_unlock(&icd->video_lock);

	return 0;		return 0;