diff options
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-dvb.c | 4 | ||||
| -rw-r--r-- | v4l/ChangeLog | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c index 30b4418b7..e786ce51f 100644 --- a/linux/drivers/media/video/cx88/cx88-dvb.c +++ b/linux/drivers/media/video/cx88/cx88-dvb.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-dvb.c,v 1.63 2005/08/30 02:41:32 mkrufky Exp $ + * $Id: cx88-dvb.c,v 1.64 2005/09/07 00:08:09 mkrufky Exp $ * * device driver for Conexant 2388x based TV cards * MPEG Transport Stream (DVB) routines @@ -83,7 +83,7 @@ static int dvb_buf_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb, enum v4l2_field field) { struct cx8802_dev *dev = q->priv_data; - return cx8802_buf_prepare(dev, (struct cx88_buffer*)vb); + return cx8802_buf_prepare(dev, (struct cx88_buffer*)vb,field); } static void dvb_buf_queue(struct videobuf_queue *q, struct videobuf_buffer *vb) diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 5041d2964..cfe9501e0 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,12 @@ +2005-09-07 00:02 mkrufky + + * cx88-dvb.c: (dvb_buf_prepare): + - Climov's previous patch <missing changelog entry>: + Implemented the v4l2 mpeg api for blackbird cards. + His commit broke cx88-dvb. Here is the fix. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-09-05 15:30 nshmyrev * doc/CARDLIST.saa7134: |