Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[net-next-2.6.git] / drivers / media / video / zoran / zoran_driver.c

diff --git a/drivers/media/video/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c
index 6f89d0a096ead3c5f5831f999b280483ba0f7919..401082b853f086bbe67046a561d810fe43e8b173 100644 (file)
--- a/drivers/media/video/zoran/zoran_driver.c
+++ b/drivers/media/video/zoran/zoran_driver.c
@@ -1177,7 +1177,7 @@ static int setup_window(struct zoran_fh *fh, int x, int y, int width, int height
        if (height > BUZ_MAX_HEIGHT)
                height = BUZ_MAX_HEIGHT;
 
-       /* Check for vaild parameters */
+       /* Check for invalid parameters */
        if (width < BUZ_MIN_WIDTH || height < BUZ_MIN_HEIGHT ||
            width > BUZ_MAX_WIDTH || height > BUZ_MAX_HEIGHT) {
                dprintk(1,
@@ -3322,7 +3322,7 @@ zoran_mmap (struct file           *file,
 mmap_unlock_and_return:
        mutex_unlock(&zr->resource_lock);
 
-       return 0;
+       return res;
 }
 
 static const struct v4l2_ioctl_ops zoran_ioctl_ops = {