diff --git a/[refs] b/[refs] index 6ce64d96abf1..b18bd2b8001e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 739ff04f63ba6498b287021649cb999e639c3c83 +refs/heads/master: 4ec02ea0d88d811f61e2c7765418eff770936871 diff --git a/trunk/drivers/media/dvb/dvb-usb/technisat-usb2.c b/trunk/drivers/media/dvb/dvb-usb/technisat-usb2.c index 406602a1499d..10151aa49239 100644 --- a/trunk/drivers/media/dvb/dvb-usb/technisat-usb2.c +++ b/trunk/drivers/media/dvb/dvb-usb/technisat-usb2.c @@ -767,7 +767,7 @@ static void technisat_usb2_disconnect(struct usb_interface *intf) if (dev != NULL) { struct technisat_usb2_state *state = dev->priv; if (state != NULL) { - cancel_rearming_delayed_work(&state->green_led_work); + cancel_delayed_work_sync(&state->green_led_work); flush_scheduled_work(); } }