projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[cascardo/linux.git]
/
drivers
/
media
/
video
/
sh_mobile_ceu_camera.c
diff --git
a/drivers/media/video/sh_mobile_ceu_camera.c
b/drivers/media/video/sh_mobile_ceu_camera.c
index
2486520
..
954222b
100644
(file)
--- a/
drivers/media/video/sh_mobile_ceu_camera.c
+++ b/
drivers/media/video/sh_mobile_ceu_camera.c
@@
-1786,7
+1786,7
@@
static void sh_mobile_ceu_init_videobuf(struct videobuf_queue *q,
V4L2_BUF_TYPE_VIDEO_CAPTURE,
pcdev->field,
sizeof(struct sh_mobile_ceu_buffer),
- icd,
NULL
);
+ icd,
&icd->video_lock
);
}
static int sh_mobile_ceu_get_ctrl(struct soc_camera_device *icd,