projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[deliverable/linux.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 3c471a4e3e4ad281a8a9b7b41757b31c475a0ae8..401082b853f086bbe67046a561d810fe43e8b173 100644
(file)
--- a/
drivers/media/video/zoran/zoran_driver.c
+++ b/
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 = {
This page took
0.025764 seconds
and
5
git commands to generate.