diff options
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-usb/opera1.c | 6 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-cards.c | 14 |
2 files changed, 6 insertions, 14 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/opera1.c b/linux/drivers/media/dvb/dvb-usb/opera1.c index 564a64f0d..e2c8e5395 100644 --- a/linux/drivers/media/dvb/dvb-usb/opera1.c +++ b/linux/drivers/media/dvb/dvb-usb/opera1.c @@ -48,8 +48,8 @@ static int opera1_xilinx_rw(struct usb_device *dev, u8 request, u16 value, int ret; u8 r; u8 u8buf[len]; - - unsigned int pipe = (flags == OPERA_READ_MSG) ? + + unsigned int pipe = (flags == OPERA_READ_MSG) ? usb_rcvctrlpipe(dev,0) : usb_sndctrlpipe(dev, 0); u8 request_type = (flags == OPERA_READ_MSG) ? USB_DIR_IN : USB_DIR_OUT; @@ -114,7 +114,7 @@ static int opera1_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], { struct dvb_usb_device *d = i2c_get_adapdata(adap); int i = 0, tmp = 0; - + if (!d) return -ENODEV; if (mutex_lock_interruptible(&d->i2c_mutex) < 0) diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index 7b1fb79b6..6be16512a 100644 --- a/linux/drivers/media/video/cx88/cx88-cards.c +++ b/linux/drivers/media/video/cx88/cx88-cards.c @@ -983,17 +983,9 @@ struct cx88_board cx88_boards[] = { .input = {{ .type = CX88_VMUX_TELEVISION, .vmux = 0, - .gpio0 = 0x0400, /* pin 2:mute = 0 (off?) */ - .gpio1 = 0x0000, - .gpio2 = 0x0800, /* pin 19:audio = 0 (tv) */ - - },{ - .type = CX88_VMUX_COMPOSITE1, - .vmux = 1, - .gpio0 = 0x0400, /* probably? or 0x0404 to turn mute on */ - .gpio1 = 0x0000, - .gpio2 = 0x0808, /* pin 19:audio = 1 (line) */ - + },{ + .type = CX88_VMUX_COMPOSITE1, + .vmux = 1, },{ .type = CX88_VMUX_SVIDEO, .vmux = 2, |