From 28fa3d845d6abd54826c7046bab053e67e9512bc Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Mon, 16 Aug 2010 13:27:47 -0300
Subject: [PATCH] --- yaml --- r: 219068 b: refs/heads/master c:
 3053814c1cbedb9d2802240f414588009706c74d h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 54feec69c995..f4071ffc9a5c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f27709792912d30a4f1f5ae98fd23aab2d4483b4
+refs/heads/master: 3053814c1cbedb9d2802240f414588009706c74d
diff --git a/trunk/drivers/media/video/zr364xx.c b/trunk/drivers/media/video/zr364xx.c
index a82b5bd18d26..616c61fb3493 100644
--- a/trunk/drivers/media/video/zr364xx.c
+++ b/trunk/drivers/media/video/zr364xx.c
@@ -572,7 +572,7 @@ static int zr364xx_got_frame(struct zr364xx_camera *cam, int jpgsize)
 	DBG("wakeup [buf/i] [%p/%d]\n", buf, buf->vb.i);
 unlock:
 	spin_unlock_irqrestore(&cam->slock, flags);
-	return 0;
+	return rc;
 }
 
 /* this function moves the usb stream read pipe data