diff --git a/[refs] b/[refs]
index 8fa9ffc1a42f..0cb74e10a9ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f20a07d431c3c516c37beff9638f70c8e059a3fc
+refs/heads/master: 106d7e376f3fcca7832561d6399f6b42f8530018
diff --git a/trunk/drivers/media/video/saa7164/saa7164-vbi.c b/trunk/drivers/media/video/saa7164/saa7164-vbi.c
index c9b124cdd57e..9327848b2693 100644
--- a/trunk/drivers/media/video/saa7164/saa7164-vbi.c
+++ b/trunk/drivers/media/video/saa7164/saa7164-vbi.c
@@ -1112,7 +1112,7 @@ static ssize_t fops_read(struct file *file, char __user *buffer,
 	struct saa7164_port *port = fh->port;
 	struct saa7164_user_buffer *ubuf = NULL;
 	struct saa7164_dev *dev = port->dev;
-	unsigned int ret = 0;
+	int ret = 0;
 	int rem, cnt;
 	u8 *p;