diff options
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-input.c')
-rw-r--r-- | drivers/media/video/em28xx/em28xx-input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/em28xx/em28xx-input.c b/drivers/media/video/em28xx/em28xx-input.c index 6759cd5570dd..99403c720e3a 100644 --- a/drivers/media/video/em28xx/em28xx-input.c +++ b/drivers/media/video/em28xx/em28xx-input.c | |||
@@ -557,7 +557,7 @@ void em28xx_deregister_snapshot_button(struct em28xx *dev) | |||
557 | { | 557 | { |
558 | if (dev->sbutton_input_dev != NULL) { | 558 | if (dev->sbutton_input_dev != NULL) { |
559 | em28xx_info("Deregistering snapshot button\n"); | 559 | em28xx_info("Deregistering snapshot button\n"); |
560 | cancel_rearming_delayed_work(&dev->sbutton_query_work); | 560 | cancel_delayed_work_sync(&dev->sbutton_query_work); |
561 | input_unregister_device(dev->sbutton_input_dev); | 561 | input_unregister_device(dev->sbutton_input_dev); |
562 | dev->sbutton_input_dev = NULL; | 562 | dev->sbutton_input_dev = NULL; |
563 | } | 563 | } |