diff options
| author | Hartmut Hackmann <hartmut.hackmann@t-online.de> | 2007-02-17 01:16:41 +0100 |
|---|---|---|
| committer | Hartmut Hackmann <hartmut.hackmann@t-online.de> | 2007-02-17 01:16:41 +0100 |
| commit | 5a728a822e3d6d1fc62e86410ec71cb87504f08b (patch) | |
| tree | 63be62ced84f42da611fe8cda64da85e39a76337 /linux/drivers/media/dvb/dvb-usb/dvb-usb-remote.c | |
| parent | 4850e008216efdfb888352955d0d166d7363743c (diff) | |
| parent | 14f8694a006fc440ea2f5f18aaefd3ff7d98e313 (diff) | |
| download | mediapointer-dvb-s2-5a728a822e3d6d1fc62e86410ec71cb87504f08b.tar.gz mediapointer-dvb-s2-5a728a822e3d6d1fc62e86410ec71cb87504f08b.tar.bz2 | |
merge with main repository
From: Hartmut Hackmann <hartmut.hackmann@t-online.de>
Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
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.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); } |