diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-29 16:34:53 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-29 16:34:53 -0200 |
| commit | 07076f4e470cf7ed9f44a8ad7db2a8255a58d4e1 (patch) | |
| tree | 6ed266b03df70152c53a827586ad3324f4e147e5 | |
| parent | 1f3a1c6934978f2be07fe09d01b3e4d1f979a43f (diff) | |
| parent | c3e8ee8a3c518a9fcd46aeb71d03e798beaa283a (diff) | |
| download | mediapointer-dvb-s2-07076f4e470cf7ed9f44a8ad7db2a8255a58d4e1.tar.gz mediapointer-dvb-s2-07076f4e470cf7ed9f44a8ad7db2a8255a58d4e1.tar.bz2 | |
merge: http://linuxtv.org/hg/~jfrancois/gspca/
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | linux/drivers/media/dvb/dvb-usb/usb-urb.c | 3 | ||||
| -rw-r--r-- | v4l/versions.txt | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/usb-urb.c b/linux/drivers/media/dvb/dvb-usb/usb-urb.c index eb3aaaf7a..5becc5a20 100644 --- a/linux/drivers/media/dvb/dvb-usb/usb-urb.c +++ b/linux/drivers/media/dvb/dvb-usb/usb-urb.c @@ -160,7 +160,8 @@ static int usb_bulk_urb_init(struct usb_data_stream *stream) stream->props.u.bulk.buffersize, usb_urb_complete, stream); - stream->urb_list[i]->transfer_flags = 0; + stream->urb_list[i]->transfer_flags = URB_NO_TRANSFER_DMA_MAP; + stream->urb_list[i]->transfer_dma = stream->dma_addr[i]; stream->urbs_initialized++; } return 0; diff --git a/v4l/versions.txt b/v4l/versions.txt index 0393e79b0..6d547a509 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -1,6 +1,9 @@ # Use this for stuff for drivers that don't compile [2.6.99] +[2.6.28] +USB_STV06XX + [2.6.26] # Needs camera.h VIDEO_PXA27x |