summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/dvb/dvb-usb/dvb-usb-remote.c')
-rw-r--r--linux/drivers/media/dvb/dvb-usb/dvb-usb-remote.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/dvb-usb-remote.c b/linux/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
index 70d133076..9f1e23f82 100644
--- a/linux/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
+++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
@@ -21,7 +21,7 @@ static void dvb_usb_read_remote_control(void *data)
/* TODO: need a lock here. We can simply skip checking for the remote control
if we're busy. */
- if (d->props.query_rc(d,&event,&state)) {
+ if (d->props.rc_query(d,&event,&state)) {
err("error while querying for an remote control event.");
goto schedule;
}
@@ -118,19 +118,19 @@ int dvb_usb_remote_init(struct dvb_usb_device *d)
info("schedule remote query interval to %d msecs.",d->props.rc_interval);
schedule_delayed_work(&d->rc_query_work,msecs_to_jiffies(d->props.rc_interval));
- d->init_state |= DVB_USB_STATE_REMOTE;
+ d->state |= DVB_USB_STATE_REMOTE;
return 0;
}
int dvb_usb_remote_exit(struct dvb_usb_device *d)
{
- if (d->init_state & DVB_USB_STATE_REMOTE) {
+ if (d->state & DVB_USB_STATE_REMOTE) {
cancel_delayed_work(&d->rc_query_work);
flush_scheduled_work();
input_unregister_device(&d->rc_input_dev);
}
- d->init_state &= ~DVB_USB_STATE_REMOTE;
+ d->state &= ~DVB_USB_STATE_REMOTE;
return 0;
}