diff options
| author | Alex Woods <devnull@localhost> | 2005-01-09 16:51:17 +0000 |
|---|---|---|
| committer | Alex Woods <devnull@localhost> | 2005-01-09 16:51:17 +0000 |
| commit | 5ea20399906214c72720065c2b428a9459b85926 (patch) | |
| tree | fa798b4a499961000ec1606980cec0013334e984 /linux/drivers/media/dvb/ttusb-dec | |
| parent | ff21bded4892d260edde81df8e8f108aa229c7fc (diff) | |
| download | mediapointer-dvb-s2-5ea20399906214c72720065c2b428a9459b85926.tar.gz mediapointer-dvb-s2-5ea20399906214c72720065c2b428a9459b85926.tar.bz2 | |
Use usb_kill_urb instead of usb_unlink_urb for kernels greater than 2.6.7.
Diffstat (limited to 'linux/drivers/media/dvb/ttusb-dec')
| -rw-r--r-- | linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c index c3e403007..50408cee0 100644 --- a/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c +++ b/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c @@ -755,7 +755,11 @@ static void ttusb_dec_stop_iso_xfer(struct ttusb_dec *dec) if (!dec->iso_stream_count) { for (i = 0; i < ISO_BUF_COUNT; i++) +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,7) usb_unlink_urb(dec->iso_urb[i]); +#else + usb_kill_urb(dec->iso_urb[i]); +#endif } up(&dec->iso_sem); @@ -820,7 +824,11 @@ static int ttusb_dec_start_iso_xfer(struct ttusb_dec *dec) "error %d\n", __FUNCTION__, i, result); while (i) { +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,7) usb_unlink_urb(dec->iso_urb[i - 1]); +#else + usb_kill_urb(dec->iso_urb[i - 1]); +#endif i--; } @@ -1378,7 +1386,11 @@ static void ttusb_dec_exit_usb(struct ttusb_dec *dec) dec->iso_stream_count = 0; for (i = 0; i < ISO_BUF_COUNT; i++) +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,7) usb_unlink_urb(dec->iso_urb[i]); +#else + usb_kill_urb(dec->iso_urb[i]); +#endif ttusb_dec_free_iso_urbs(dec); } |