From e9856d10940501d9097e8a8d5bee3887528eca96 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 25 Jul 2011 12:49:46 -0300 Subject: [PATCH] --- yaml --- r: 294857 b: refs/heads/master c: ba02473eaaaa9e579a4bdbe9f15a5ad777764580 h: refs/heads/master i: 294855: 5f66362a2fad6faa6ee3d928e61d5cc32d135523 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/dvb-usb/az6007.c | 29 ------------------------ 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/[refs] b/[refs] index 2e9e4369cc65..f5683dc44df9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3aecf2c5a9881024dc7742568146e2f9a10f19a6 +refs/heads/master: ba02473eaaaa9e579a4bdbe9f15a5ad777764580 diff --git a/trunk/drivers/media/dvb/dvb-usb/az6007.c b/trunk/drivers/media/dvb/dvb-usb/az6007.c index 8add81ade087..912ba67bc393 100644 --- a/trunk/drivers/media/dvb/dvb-usb/az6007.c +++ b/trunk/drivers/media/dvb/dvb-usb/az6007.c @@ -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); @@ -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,