diff options
Diffstat (limited to 'linux/drivers/media/dvb/ttusb-dec')
| -rw-r--r-- | linux/drivers/media/dvb/ttusb-dec/dec2000_frontend.c | 6 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c | 20 |
2 files changed, 9 insertions, 17 deletions
diff --git a/linux/drivers/media/dvb/ttusb-dec/dec2000_frontend.c b/linux/drivers/media/dvb/ttusb-dec/dec2000_frontend.c index 4a8ae58ff..fd07e7b4c 100644 --- a/linux/drivers/media/dvb/ttusb-dec/dec2000_frontend.c +++ b/linux/drivers/media/dvb/ttusb-dec/dec2000_frontend.c @@ -19,8 +19,11 @@ * */ +#include <linux/init.h> +#include <linux/module.h> + #include "dvb_frontend.h" -#include "dvb_compat.h" +#include "dvb_functions.h" static int debug = 0; @@ -192,3 +195,4 @@ MODULE_LICENSE("GPL"); MODULE_PARM(debug, "i"); MODULE_PARM_DESC(debug, "Debug level"); + diff --git a/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c index 9ab8baeee..b86dcc616 100644 --- a/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c +++ b/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c @@ -25,7 +25,7 @@ #include <linux/usb.h> #include "ttusb_dec.h" -#include "dvb_compat.h" +#include "dvb_functions.h" #include "dvb_frontend.h" static int debug = 0; @@ -470,10 +470,7 @@ ttusb_dec_process_urb(struct urb *urb, struct pt_regs *ptregs) } -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) - usb_submit_urb(urb URB_MEM_FLAG); -#endif - + usb_submit_urb(urb, GFP_KERNEL); } static void @@ -576,7 +573,7 @@ ttusb_dec_start_iso_xfer(struct ttusb_dec *dec) for (i = 0; i < ISO_BUF_COUNT; i++) { - if ((result = usb_submit_urb(dec->iso_urb[i] URB_MEM_FLAG))) { + if ((result = usb_submit_urb(dec->iso_urb[i], GFP_KERNEL))) { printk("%s: failed urb submission %d: error %d\n", __FUNCTION__, i, result); @@ -762,7 +759,7 @@ ttusb_dec_alloc_iso_urbs(struct ttusb_dec * dec) struct urb *urb; - if (!(urb = usb_alloc_urb(FRAMES_PER_ISO_BUF URB_MEM_FLAG))) { + if (!(urb = usb_alloc_urb(FRAMES_PER_ISO_BUF, GFP_KERNEL))) { ttusb_dec_free_iso_urbs(dec); return -ENOMEM; @@ -775,15 +772,6 @@ ttusb_dec_alloc_iso_urbs(struct ttusb_dec * dec) ttusb_dec_setup_urbs(dec); -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) - for (i = 0; i < ISO_BUF_COUNT; i++) { - - int next = (i + 1) % ISO_BUF_COUNT; - dec->iso_urb[i]->next = dec->iso_urb[next]; - - } -#endif - return 0; } |