diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-26 11:54:52 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-26 11:54:52 -0300 |
| commit | ff1932a9bc2b54a130d135a19cc82e5c61130db0 (patch) | |
| tree | 0350d144e0a90d6263fe5dfbb4630ec7b8d7f46b /linux/drivers/media/dvb/dvb-usb | |
| parent | 17f89c4f89ca31ad9e0bb7630d9579371ee32e7f (diff) | |
| parent | 3a0a7c3cc611b7e0981fea49e36822133337a9da (diff) | |
| download | mediapointer-dvb-s2-ff1932a9bc2b54a130d135a19cc82e5c61130db0.tar.gz mediapointer-dvb-s2-ff1932a9bc2b54a130d135a19cc82e5c61130db0.tar.bz2 | |
merge: http://linuxtv.org/hg/~anttip/v4l-dvb/
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/dvb-usb')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-usb/Kconfig | 2 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/dvb-usb/gp8psk.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/Kconfig b/linux/drivers/media/dvb/dvb-usb/Kconfig index e2abf61f8..615e5bbec 100644 --- a/linux/drivers/media/dvb/dvb-usb/Kconfig +++ b/linux/drivers/media/dvb/dvb-usb/Kconfig @@ -1,6 +1,6 @@ config DVB_USB tristate "Support for various USB DVB devices" - depends on DVB_CORE && USB && I2C + depends on DVB_CORE && USB && I2C && INPUT depends on HOTPLUG # due to FW_LOADER select FW_LOADER help diff --git a/linux/drivers/media/dvb/dvb-usb/gp8psk.c b/linux/drivers/media/dvb/dvb-usb/gp8psk.c index cc99e1cab..0a152fcb5 100644 --- a/linux/drivers/media/dvb/dvb-usb/gp8psk.c +++ b/linux/drivers/media/dvb/dvb-usb/gp8psk.c @@ -146,24 +146,24 @@ static int gp8psk_power_ctrl(struct dvb_usb_device *d, int onoff) if (gp_product_id == USB_PID_GENPIX_8PSK_REV_1_WARM) if (! (status & bm8pskFW_Loaded)) /* BCM4500 firmware loaded */ if(gp8psk_load_bcm4500fw(d)) - return EINVAL; + return -EINVAL; if (! (status & bmIntersilOn)) /* LNB Power */ if (gp8psk_usb_in_op(d, START_INTERSIL, 1, 0, &buf, 1)) - return EINVAL; + return -EINVAL; /* Set DVB mode to 1 */ if (gp_product_id == USB_PID_GENPIX_8PSK_REV_1_WARM) if (gp8psk_usb_out_op(d, SET_DVB_MODE, 1, 0, NULL, 0)) - return EINVAL; + return -EINVAL; /* Abort possible TS (if previous tune crashed) */ if (gp8psk_usb_out_op(d, ARM_TRANSFER, 0, 0, NULL, 0)) - return EINVAL; + return -EINVAL; } else { /* Turn off LNB power */ if (gp8psk_usb_in_op(d, START_INTERSIL, 0, 0, &buf, 1)) - return EINVAL; + return -EINVAL; /* Turn off 8psk power */ if (gp8psk_usb_in_op(d, BOOT_8PSK, 0, 0, &buf, 1)) return -EINVAL; |