git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...
[pandora-kernel.git]
/
drivers
/
media
/
video
/
videobuf-dvb.c
diff --git
a/drivers/media/video/videobuf-dvb.c
b/drivers/media/video/videobuf-dvb.c
index
3f76398
..
3de7c7e
100644
(file)
--- a/
drivers/media/video/videobuf-dvb.c
+++ b/
drivers/media/video/videobuf-dvb.c
@@
-57,7
+57,7
@@
static int videobuf_dvb_thread(void *data)
buf = list_entry(dvb->dvbq.stream.next,
struct videobuf_buffer, stream);
list_del(&buf->stream);
buf = list_entry(dvb->dvbq.stream.next,
struct videobuf_buffer, stream);
list_del(&buf->stream);
- err = videobuf_waiton(
buf,0,
1);
+ err = videobuf_waiton(
&dvb->dvbq, buf, 0,
1);
/* no more feeds left or stop_feed() asked us to quit */
if (0 == dvb->nfeeds)
/* no more feeds left or stop_feed() asked us to quit */
if (0 == dvb->nfeeds)