aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/dvb-usb/dtv5100.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/media/dvb/dvb-usb/dtv5100.c b/drivers/media/dvb/dvb-usb/dtv5100.c
index 7168a49cecf4..b2e6f7ff1a08 100644
--- a/drivers/media/dvb/dvb-usb/dtv5100.c
+++ b/drivers/media/dvb/dvb-usb/dtv5100.c
@@ -32,7 +32,7 @@ MODULE_PARM_DESC(debug, "set debugging level" DVB_USB_DEBUG_STATUS);
32DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); 32DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
33 33
34static int dtv5100_i2c_msg(struct dvb_usb_device *d, u8 addr, 34static int dtv5100_i2c_msg(struct dvb_usb_device *d, u8 addr,
35 u8 *wbuf, u16 wlen, u8 *rbuf, u16 rlen) 35 u8 *wbuf, u16 wlen, u8 *rbuf, u16 rlen)
36{ 36{
37 u8 request; 37 u8 request;
38 u8 type; 38 u8 type;
@@ -44,14 +44,14 @@ static int dtv5100_i2c_msg(struct dvb_usb_device *d, u8 addr,
44 /* write { reg }, read { value } */ 44 /* write { reg }, read { value } */
45 request = (addr == DTV5100_DEMOD_ADDR ? DTV5100_DEMOD_READ : 45 request = (addr == DTV5100_DEMOD_ADDR ? DTV5100_DEMOD_READ :
46 DTV5100_TUNER_READ); 46 DTV5100_TUNER_READ);
47 type = USB_TYPE_VENDOR|USB_DIR_IN; 47 type = USB_TYPE_VENDOR | USB_DIR_IN;
48 value = 0; 48 value = 0;
49 break; 49 break;
50 case 2: 50 case 2:
51 /* write { reg, value } */ 51 /* write { reg, value } */
52 request = (addr == DTV5100_DEMOD_ADDR ? DTV5100_DEMOD_WRITE : 52 request = (addr == DTV5100_DEMOD_ADDR ? DTV5100_DEMOD_WRITE :
53 DTV5100_TUNER_WRITE); 53 DTV5100_TUNER_WRITE);
54 type = USB_TYPE_VENDOR|USB_DIR_OUT; 54 type = USB_TYPE_VENDOR | USB_DIR_OUT;
55 value = wbuf[1]; 55 value = wbuf[1];
56 break; 56 break;
57 default: 57 default:
@@ -68,7 +68,7 @@ static int dtv5100_i2c_msg(struct dvb_usb_device *d, u8 addr,
68 68
69/* I2C */ 69/* I2C */
70static int dtv5100_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], 70static int dtv5100_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
71 int num) 71 int num)
72{ 72{
73 struct dvb_usb_device *d = i2c_get_adapdata(adap); 73 struct dvb_usb_device *d = i2c_get_adapdata(adap);
74 int i; 74 int i;
@@ -116,7 +116,7 @@ static struct zl10353_config dtv5100_zl10353_config = {
116static int dtv5100_frontend_attach(struct dvb_usb_adapter *adap) 116static int dtv5100_frontend_attach(struct dvb_usb_adapter *adap)
117{ 117{
118 adap->fe = dvb_attach(zl10353_attach, &dtv5100_zl10353_config, 118 adap->fe = dvb_attach(zl10353_attach, &dtv5100_zl10353_config,
119 &adap->dev->i2c_adap); 119 &adap->dev->i2c_adap);
120 if (adap->fe == NULL) 120 if (adap->fe == NULL)
121 return -EIO; 121 return -EIO;
122 122
@@ -147,11 +147,10 @@ static int dtv5100_probe(struct usb_interface *intf,
147 struct usb_device *udev = interface_to_usbdev(intf); 147 struct usb_device *udev = interface_to_usbdev(intf);
148 148
149 /* initialize non qt1010/zl10353 part? */ 149 /* initialize non qt1010/zl10353 part? */
150 for (i = 0; dtv5100_init[i].request; i++) 150 for (i = 0; dtv5100_init[i].request; i++) {
151 {
152 ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 151 ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
153 dtv5100_init[i].request, 152 dtv5100_init[i].request,
154 USB_TYPE_VENDOR|USB_DIR_OUT, 153 USB_TYPE_VENDOR | USB_DIR_OUT,
155 dtv5100_init[i].value, 154 dtv5100_init[i].value,
156 dtv5100_init[i].index, NULL, 0, 155 dtv5100_init[i].index, NULL, 0,
157 DTV5100_USB_TIMEOUT); 156 DTV5100_USB_TIMEOUT);