---

yaml --- r: 219066 b: refs/heads/master c: 46a7a3c h: refs/heads/master v: v3
git-mirror · Oct 21, 2010 · db2fa7c · db2fa7c
1 parent 6cc3f6a
commit db2fa7c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 = {