Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 294857
b: refs/heads/master
c: ba02473
h: refs/heads/master
i:
  294855: 5f66362
v: v3
  • Loading branch information
Mauro Carvalho Chehab committed Jan 21, 2012
1 parent 4a3c040 commit e9856d1
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 30 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: 3aecf2c5a9881024dc7742568146e2f9a10f19a6
refs/heads/master: ba02473eaaaa9e579a4bdbe9f15a5ad777764580
29 changes: 0 additions & 29 deletions trunk/drivers/media/dvb/dvb-usb/az6007.c
Original file line number Diff line number Diff line change
Expand Up @@ -259,34 +259,6 @@ static int az6007_frontend_poweron(struct dvb_usb_adapter *adap)
return ret;
}

static int az6007_frontend_reset(struct dvb_usb_adapter *adap)
{
struct usb_device *udev = adap->dev->udev;
int ret;

deb_info("az6007_frontend_reset adap=%p adap->dev=%p\n", adap, adap->dev);

/* reset demodulator */
ret = az6007_write(udev, FX2_SCON1, 1, 3, NULL, 0);
if (ret < 0)
goto error;
msleep(200);
ret = az6007_write(udev, FX2_SCON1, 0, 3, NULL, 0);
if (ret < 0)
goto error;
msleep(200);
ret = az6007_write(udev, FX2_SCON1, 1, 3, NULL, 0);
if (ret < 0)
goto error;
msleep(200);

error:
if (ret < 0)
err("%s failed with error %d", __func__, ret);

return ret;
}

static int az6007_led_on_off(struct usb_interface *intf, int onoff)
{
struct usb_device *udev = interface_to_usbdev(intf);
Expand All @@ -309,7 +281,6 @@ static int az6007_frontend_attach(struct dvb_usb_adapter *adap)
BUG_ON(!st);

az6007_frontend_poweron(adap);
az6007_frontend_reset(adap);

info("az6007: attaching demod drxk");
adap->fe = dvb_attach(drxk_attach, &terratec_h7_drxk,
Expand Down

0 comments on commit e9856d1

Please sign in to comment.