From db2fa7ca51cad03bba29fa05ede871e480185553 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Mon, 16 Aug 2010 13:25:39 -0300
Subject: [PATCH] --- yaml --- r: 219066 b: refs/heads/master c:
 46a7a3cc9fe11f7a8d58fee6e7d5849298bc0212 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 07eb19c810e2..13ac765bfd60 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 473d80247332b818caf6d25ed3eaaa10d3dfcfb7
+refs/heads/master: 46a7a3cc9fe11f7a8d58fee6e7d5849298bc0212
diff --git a/trunk/drivers/media/video/zoran/zoran_driver.c b/trunk/drivers/media/video/zoran/zoran_driver.c
index 6f89d0a096ea..c155ddfb1332 100644
--- a/trunk/drivers/media/video/zoran/zoran_driver.c
+++ b/trunk/drivers/media/video/zoran/zoran_driver.c
@@ -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 = {