diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-06 22:22:25 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-06 22:22:25 -0200 |
| commit | aa76e2d035b686e2d6e0c84c6a80ce69147d3d87 (patch) | |
| tree | e4640bb6cfd8a186eb26701026fc1a7eb22db04a /linux | |
| parent | cfdafbfa99ae8858be9853b49f8140d159c85d57 (diff) | |
| parent | a3318fa68e690e504facbbb034973611802f26c6 (diff) | |
| download | mediapointer-dvb-s2-aa76e2d035b686e2d6e0c84c6a80ce69147d3d87.tar.gz mediapointer-dvb-s2-aa76e2d035b686e2d6e0c84c6a80ce69147d3d87.tar.bz2 | |
Merge: http://linuxtv.org/hg/~hverkuil/v4l-dvb2
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux')
| -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 1bee5dfad..7b899cd6b 100644 --- a/linux/drivers/media/dvb/dvb-usb/dvb-usb-remote.c +++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb-remote.c @@ -174,7 +174,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); } |