From 5a9b488a2f9c0d4890d6b48361926f19db4f4d6e Mon Sep 17 00:00:00 2001
From: Gavin Hurlbut <gjhurlbu@gmail.com>
Date: Thu, 30 Sep 2010 18:21:20 -0300
Subject: [PATCH] --- yaml --- r: 219403 b: refs/heads/master c:
 106d7e376f3fcca7832561d6399f6b42f8530018 h: refs/heads/master i:   219401:
 0e9ae1c1990b4ebcb614555018630768c62983f7   219399:
 4731ccfbd3e0f94f6b03e8ceac08ffaca007ca0e v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/video/saa7164/saa7164-vbi.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;