diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-06 22:41:48 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-06 22:41:48 -0200 |
| commit | c130ca611b7b095a907925540ed1b33b7d8f8272 (patch) | |
| tree | 5fba8eac597e012cbdadf9630a18e098abc0a68a /linux/drivers/media/dvb/dvb-usb | |
| parent | a1082a831b2f317f6eadd4e9b500c53e0457c94b (diff) | |
| parent | a2277247714a35325a228e495412628fa1c42ff8 (diff) | |
| download | mediapointer-dvb-s2-c130ca611b7b095a907925540ed1b33b7d8f8272.tar.gz mediapointer-dvb-s2-c130ca611b7b095a907925540ed1b33b7d8f8272.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/dvb-usb')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-usb/dvb-usb-remote.c | 2 |
1 files changed, 1 insertions, 1 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 1a86adbfa..cccc2512a 100644 --- a/linux/drivers/media/dvb/dvb-usb/dvb-usb-remote.c +++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb-remote.c @@ -171,7 +171,7 @@ int dvb_usb_remote_init(struct dvb_usb_device *d) int dvb_usb_remote_exit(struct dvb_usb_device *d) { if (d->state & DVB_USB_STATE_REMOTE) { - cancel_delayed_work(&d->rc_query_work); + cancel_rearming_delayed_work(&d->rc_query_work); flush_scheduled_work(); input_unregister_device(d->rc_input_dev); } |