diff --git a/[refs] b/[refs]
index ad8ff5b5cc7f..b59ccc3013fd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ecc67d108d6ade14d79c8546f5db36613c780d59
+refs/heads/master: 92fcbd3f4ea07a8efd2d2881645baae0a061c82e
diff --git a/trunk/drivers/media/video/cx231xx/cx231xx-video.c b/trunk/drivers/media/video/cx231xx/cx231xx-video.c
index c8d6e9a04723..9b89a91e0c2a 100644
--- a/trunk/drivers/media/video/cx231xx/cx231xx-video.c
+++ b/trunk/drivers/media/video/cx231xx/cx231xx-video.c
@@ -1614,7 +1614,7 @@ static int vidioc_streamoff(struct file *file, void *priv,
 	if (rc < 0)
 		return rc;
 
-	if ((fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) ||
+	if ((fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) &&
 	    (fh->type != V4L2_BUF_TYPE_VBI_CAPTURE))
 		return -EINVAL;
 	if (type != fh->type)