summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
diff options
context:
space:
mode:
authorMichael Hunold <devnull@localhost>2005-01-21 14:45:06 +0000
committerMichael Hunold <devnull@localhost>2005-01-21 14:45:06 +0000
commitb166ed22268f79cb34ef95ce95631331381717ff (patch)
treec735880d90aa3bcfa36374817820416b38d8873a /linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
parent6d40e62c1ad6249ce66d56629d0c76bcd064e3fd (diff)
downloadmediapointer-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-budget/dvb-ttusb-budget.c')
-rw-r--r--linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index ea73889d6..b54f1e7d9 100644
--- a/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -1349,7 +1349,7 @@ static struct tda8083_config ttusb_novas_grundig_29504_491_config = {
static void frontend_init(struct ttusb* ttusb)
{
- switch(ttusb->dev->descriptor.idProduct) {
+ switch(le16_to_cpu(ttusb->dev->descriptor.idProduct)) {
case 0x1003: // Hauppauge/TT Nova-USB-S budget (stv0299/ALPS BSRU6(tsa5059)
// try the ALPS BSRU6 first
ttusb->fe = stv0299_attach(&alps_bsru6_config, &ttusb->i2c_adap);
@@ -1382,8 +1382,8 @@ static void frontend_init(struct ttusb* ttusb)
if (ttusb->fe == NULL) {
printk("dvb-ttusb-budget: A frontend driver was not found for device %04x/%04x\n",
- ttusb->dev->descriptor.idVendor,
- ttusb->dev->descriptor.idProduct);
+ le16_to_cpu(ttusb->dev->descriptor.idVendor),
+ le16_to_cpu(ttusb->dev->descriptor.idProduct));
} else {
if (dvb_register_frontend(ttusb->adapter, ttusb->fe)) {
printk("dvb-ttusb-budget: Frontend registration failed!\n");