UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] dvb_usb_v2: simplify remote init/exit logic 

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-06-15 00:52:42 -03:00 committed by Mauro Carvalho Chehab
parent 6e3a5daa6e
commit ad26183931
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/media/dvb/dvb-usb/dvb_usb.h
View File

@ -328,7 +328,6 @@ struct dvb_usb_device {
#define DVB_USB_STATE_INIT 0x000 #define DVB_USB_STATE_INIT 0x000
#define DVB_USB_STATE_I2C 0x001 #define DVB_USB_STATE_I2C 0x001
#define DVB_USB_STATE_DVB 0x002 #define DVB_USB_STATE_DVB 0x002
#define DVB_USB_STATE_REMOTE 0x004
int state; int state;
int powered; int powered;

11
drivers/media/dvb/dvb-usb/dvb_usb_init.c
View File

@ -137,6 +137,8 @@ static int dvb_usbv2_remote_init(struct dvb_usb_device *d)
int ret; int ret;
struct rc_dev *dev; struct rc_dev *dev;
pr_debug("%s:\n", __func__);
if (dvb_usbv2_disable_rc_polling || !d->props->get_rc_config) if (dvb_usbv2_disable_rc_polling || !d->props->get_rc_config)
return 0; return 0;
@ -190,8 +192,6 @@ static int dvb_usbv2_remote_init(struct dvb_usb_device *d)
msecs_to_jiffies(d->rc.interval)); msecs_to_jiffies(d->rc.interval));
} }
d->state |= DVB_USB_STATE_REMOTE;
return 0; return 0;
err: err:
pr_debug("%s: failed=%d\n", __func__, ret); pr_debug("%s: failed=%d\n", __func__, ret);
@ -200,13 +200,14 @@ err:
static int dvb_usbv2_remote_exit(struct dvb_usb_device *d) static int dvb_usbv2_remote_exit(struct dvb_usb_device *d)
{ {
if (d->state & DVB_USB_STATE_REMOTE) { pr_debug("%s:\n", __func__);
if (d->rc_dev) {
cancel_delayed_work_sync(&d->rc_query_work); cancel_delayed_work_sync(&d->rc_query_work);
rc_unregister_device(d->rc_dev); rc_unregister_device(d->rc_dev);
d->rc_dev = NULL;
} }
d->state &= ~DVB_USB_STATE_REMOTE;
return 0; return 0;
} }