leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] af9035: minor changes for af9035_fc0011_tuner_callback()

Browse Source 
Change function to use same logic than existing functions.
Debugs log writings are done in error case, earlier it was
just returning error code.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Antti Palosaari 2012-04-05 21:52:21 -03:00 committed by Mauro Carvalho Chehab
parent dbac01ffbb
commit daacd5b27f
1 changed files with 46 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
drivers/media/dvb/dvb-usb/af9035.c
View File

@ -663,52 +663,68 @@ err:
} }
static int af9035_fc0011_tuner_callback(struct dvb_usb_device *d, static int af9035_fc0011_tuner_callback(struct dvb_usb_device *d,
int cmd, int arg) int cmd, int arg)
{ {
int err; int ret;
switch (cmd) { switch (cmd) {
case FC0011_FE_CALLBACK_POWER: case FC0011_FE_CALLBACK_POWER:
/* Tuner enable */ /* Tuner enable */
err = af9035_wr_reg_mask(d, 0xd8eb, 1, 1); ret = af9035_wr_reg_mask(d, 0xd8eb, 1, 1);
if (err) if (ret < 0)
return err; goto err;
err = af9035_wr_reg_mask(d, 0xd8ec, 1, 1);
if (err) ret = af9035_wr_reg_mask(d, 0xd8ec, 1, 1);
return err; if (ret < 0)
err = af9035_wr_reg_mask(d, 0xd8ed, 1, 1); goto err;
if (err)
return err; ret = af9035_wr_reg_mask(d, 0xd8ed, 1, 1);
if (ret < 0)
goto err;
/* LED */ /* LED */
err = af9035_wr_reg_mask(d, 0xd8d0, 1, 1); ret = af9035_wr_reg_mask(d, 0xd8d0, 1, 1);
if (err) if (ret < 0)
return err; goto err;
err = af9035_wr_reg_mask(d, 0xd8d1, 1, 1);
if (err) ret = af9035_wr_reg_mask(d, 0xd8d1, 1, 1);
return err; if (ret < 0)
goto err;
usleep_range(10000, 50000); usleep_range(10000, 50000);
break; break;
case FC0011_FE_CALLBACK_RESET: case FC0011_FE_CALLBACK_RESET:
err = af9035_wr_reg(d, 0xd8e9, 1); ret = af9035_wr_reg(d, 0xd8e9, 1);
if (err) if (ret < 0)
return err; goto err;
err = af9035_wr_reg(d, 0xd8e8, 1);
if (err) ret = af9035_wr_reg(d, 0xd8e8, 1);
return err; if (ret < 0)
err = af9035_wr_reg(d, 0xd8e7, 1); goto err;
if (err)
return err; ret = af9035_wr_reg(d, 0xd8e7, 1);
if (ret < 0)
goto err;
usleep_range(10000, 20000); usleep_range(10000, 20000);
err = af9035_wr_reg(d, 0xd8e7, 0);
if (err) ret = af9035_wr_reg(d, 0xd8e7, 0);
return err; if (ret < 0)
goto err;
usleep_range(10000, 20000); usleep_range(10000, 20000);
break; break;
default: default:
return -EINVAL; ret = -EINVAL;
goto err;
} }
return 0; return 0;
err:
pr_debug("%s: failed=%d\n", __func__, ret);
return ret;
} }
static int af9035_tuner_callback(struct dvb_usb_device *d, int cmd, int arg) static int af9035_tuner_callback(struct dvb_usb_device *d, int cmd, int arg)