1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/media/video/zr364xx.c b/drivers/media/video/zr364xx.c
index a82b5bd18d26..7dfb01e9930e 100644
--- a/drivers/media/video/zr364xx.c
+++ b/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
@@ -1304,7 +1304,7 @@ static int zr364xx_open(struct file *file)
                                     NULL, &cam->slock,
                                     cam->type,
                                     V4L2_FIELD_NONE,
-                                    sizeof(struct zr364xx_buffer), cam);
+                                    sizeof(struct zr364xx_buffer), cam, NULL);
 
         /* Added some delay here, since opening/closing the camera quickly,
          * like Ekiga does during its startup, can crash the webcam