1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c
index 8ec7c9a45a17..f5a46c458717 100644
--- a/drivers/media/video/s2255drv.c
+++ b/drivers/media/video/s2255drv.c
@@ -600,7 +600,7 @@ static int s2255_got_frame(struct s2255_channel *channel, int jpgsize)
         dprintk(2, "%s: [buf/i] [%p/%d]\n", __func__, buf, buf->vb.i);
 unlock:
         spin_unlock_irqrestore(&dev->slock, flags);
-        return 0;
+        return rc;
 }
 
 static const struct s2255_fmt *format_by_fourcc(int fourcc)
@@ -1817,7 +1817,7 @@ static int s2255_open(struct file *file)
                                     NULL, &dev->slock,
                                     fh->type,
                                     V4L2_FIELD_INTERLACED,
-                                    sizeof(struct s2255_buffer), fh);
+                                    sizeof(struct s2255_buffer), fh, NULL);
         return 0;
 }