Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 271753
b: refs/heads/master
c: db3ca1d
h: refs/heads/master
i:
  271751: 91f8702
v: v3
  • Loading branch information
Hans Verkuil authored and Mauro Carvalho Chehab committed Sep 6, 2011
1 parent 2193255 commit 4843940
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 88af83048d3bdfe3de7aee54e7117afbc2f8dd58
refs/heads/master: db3ca1d5f118ef5ab5717068ee02c1e44e011e64
12 changes: 5 additions & 7 deletions trunk/drivers/media/dvb/dvb-usb/az6027.c
Original file line number Diff line number Diff line change
Expand Up @@ -782,7 +782,6 @@ static int az6027_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
{

u8 buf;
int ret;
struct dvb_usb_adapter *adap = fe->dvb->priv;

struct i2c_msg i2c_msg = {
Expand All @@ -800,17 +799,17 @@ static int az6027_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
switch (voltage) {
case SEC_VOLTAGE_13:
buf = 1;
ret = i2c_transfer(&adap->dev->i2c_adap, &i2c_msg, 1);
i2c_transfer(&adap->dev->i2c_adap, &i2c_msg, 1);
break;

case SEC_VOLTAGE_18:
buf = 2;
ret = i2c_transfer(&adap->dev->i2c_adap, &i2c_msg, 1);
i2c_transfer(&adap->dev->i2c_adap, &i2c_msg, 1);
break;

case SEC_VOLTAGE_OFF:
buf = 0;
ret = i2c_transfer(&adap->dev->i2c_adap, &i2c_msg, 1);
i2c_transfer(&adap->dev->i2c_adap, &i2c_msg, 1);
break;

default:
Expand Down Expand Up @@ -954,7 +953,6 @@ static int az6027_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], int n
{
struct dvb_usb_device *d = i2c_get_adapdata(adap);
int i = 0, j = 0, len = 0;
int ret;
u16 index;
u16 value;
int length;
Expand Down Expand Up @@ -990,7 +988,7 @@ static int az6027_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], int n
index = (((msg[i].buf[0] << 8) & 0xff00) | (msg[i].buf[1] & 0x00ff));
value = msg[i].addr + (msg[i].len << 8);
length = msg[i + 1].len + 6;
ret = az6027_usb_in_op(d, req, value, index, data, length);
az6027_usb_in_op(d, req, value, index, data, length);
len = msg[i + 1].len;
for (j = 0; j < len; j++)
msg[i + 1].buf[j] = data[j + 5];
Expand All @@ -1017,7 +1015,7 @@ static int az6027_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], int n
index = 0x0;
value = msg[i].addr;
length = msg[i].len + 6;
ret = az6027_usb_in_op(d, req, value, index, data, length);
az6027_usb_in_op(d, req, value, index, data, length);
len = msg[i].len;
for (j = 0; j < len; j++)
msg[i].buf[j] = data[j + 5];
Expand Down

0 comments on commit 4843940

Please sign in to comment.