Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 241993
b: refs/heads/master
c: fd5466d
h: refs/heads/master
i:
  241991: 750455d
v: v3
  • Loading branch information
Igor M. Liplianin authored and Mauro Carvalho Chehab committed Mar 21, 2011
1 parent 6ee0e6d commit 94d8b51
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 10 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: b16af29a561c92ed76b5b882dd68bb082b07a09b
refs/heads/master: fd5466d1dfeba87155c7af70b7d53faa60960c19
25 changes: 16 additions & 9 deletions trunk/drivers/media/dvb/dvb-usb/dw2102.c
Original file line number Diff line number Diff line change
Expand Up @@ -1111,18 +1111,25 @@ static int zl100313_frontend_attach(struct dvb_usb_adapter *d)

static int stv0288_frontend_attach(struct dvb_usb_adapter *d)
{
u8 obuf[] = {7, 1};

d->fe = dvb_attach(stv0288_attach, &earda_config,
&d->dev->i2c_adap);
if (d->fe != NULL) {
if (dvb_attach(stb6000_attach, d->fe, 0x61,
&d->dev->i2c_adap)) {
d->fe->ops.set_voltage = dw210x_set_voltage;
info("Attached stv0288+stb6000!\n");
return 0;
}
}

return -EIO;
if (d->fe == NULL)
return -EIO;

if (NULL == dvb_attach(stb6000_attach, d->fe, 0x61, &d->dev->i2c_adap))
return -EIO;

d->fe->ops.set_voltage = dw210x_set_voltage;

dw210x_op_rw(d->dev->udev, 0x8a, 0, 0, obuf, 2, DW210X_WRITE_MSG);

info("Attached stv0288+stb6000!\n");

return 0;

}

static int ds3000_frontend_attach(struct dvb_usb_adapter *d)
Expand Down

0 comments on commit 94d8b51

Please sign in to comment.