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 'origin'
[cascardo/linux.git]
/
drivers
/
media
/
video
/
mxb.c
diff --git
a/drivers/media/video/mxb.c
b/drivers/media/video/mxb.c
index
41715ca
..
2f154f4
100644
(file)
--- a/
drivers/media/video/mxb.c
+++ b/
drivers/media/video/mxb.c
@@
-629,9
+629,9
@@
static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
}
/* fixme: locke das setzen des inputs mit hilfe des mutexes
-
down
(&dev->lock);
+
mutex_lock
(&dev->lock);
video_mux(dev,*i);
-
up
(&dev->lock);
+
mutex_unlock
(&dev->lock);
*/
/* fixme: check if streaming capture