diff options
| author | Michael Hunold <devnull@localhost> | 2005-01-21 14:45:06 +0000 |
|---|---|---|
| committer | Michael Hunold <devnull@localhost> | 2005-01-21 14:45:06 +0000 |
| commit | b166ed22268f79cb34ef95ce95631331381717ff (patch) | |
| tree | c735880d90aa3bcfa36374817820416b38d8873a /linux/drivers/media/dvb/ttusb-dec | |
| parent | 6d40e62c1ad6249ce66d56629d0c76bcd064e3fd (diff) | |
| download | mediapointer-dvb-s2-b166ed22268f79cb34ef95ce95631331381717ff.tar.gz mediapointer-dvb-s2-b166ed22268f79cb34ef95ce95631331381717ff.tar.bz2 | |
various backport from 2.6.11-rc1:
- replace static spinlock initializations with spin_lock_init()
- add le16_to_cpu() macros to various values aquired via USB
- add __user annotations to user space pointers
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, 6 insertions, 6 deletions
diff --git a/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c index cb56fdfee..540519142 100644 --- a/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c +++ b/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c @@ -1089,7 +1089,7 @@ static int ttusb_dec_alloc_iso_urbs(struct ttusb_dec *dec) static void ttusb_dec_init_tasklet(struct ttusb_dec *dec) { - dec->urb_frame_list_lock = SPIN_LOCK_UNLOCKED; + spin_lock_init(&dec->urb_frame_list_lock); INIT_LIST_HEAD(&dec->urb_frame_list); tasklet_init(&dec->urb_tasklet, ttusb_dec_process_urb_frame_list, (unsigned long)dec); @@ -1400,7 +1400,7 @@ static void ttusb_dec_exit_tasklet(struct ttusb_dec *dec) static void ttusb_dec_init_filters(struct ttusb_dec *dec) { INIT_LIST_HEAD(&dec->filter_info_list); - dec->filter_info_list_lock = SPIN_LOCK_UNLOCKED; + spin_lock_init(&dec->filter_info_list_lock); } static void ttusb_dec_exit_filters(struct ttusb_dec *dec) @@ -1446,7 +1446,7 @@ static int ttusb_dec_probe(struct usb_interface *intf, memset(dec, 0, sizeof(struct ttusb_dec)); - switch (id->idProduct) { + switch (le16_to_cpu(id->idProduct)) { case 0x1006: ttusb_dec_set_model(dec, TTUSB_DEC3000S); break; @@ -1470,7 +1470,7 @@ static int ttusb_dec_probe(struct usb_interface *intf, ttusb_dec_init_dvb(dec); dec->adapter->priv = dec; - switch (id->idProduct) { + switch (le16_to_cpu(id->idProduct)) { case 0x1006: dec->fe = ttusbdecfe_dvbs_attach(&fe_config); break; @@ -1483,8 +1483,8 @@ static int ttusb_dec_probe(struct usb_interface *intf, if (dec->fe == NULL) { printk("dvb-ttusb-dec: A frontend driver was not found for device %04x/%04x\n", - dec->udev->descriptor.idVendor, - dec->udev->descriptor.idProduct); + le16_to_cpu(dec->udev->descriptor.idVendor), + le16_to_cpu(dec->udev->descriptor.idProduct)); } else { if (dvb_register_frontend(dec->adapter, dec->fe)) { printk("budget-ci: Frontend registration failed!\n"); |