From b619838bf4a91f4ba62281e99d9031fd6e068f24 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Mon, 10 Jan 2011 21:42:12 -0200
Subject: [PATCH] --- yaml --- r: 241751 b: refs/heads/master c:
 4ec02ea0d88d811f61e2c7765418eff770936871 h: refs/heads/master i:   241749:
 838e2ec7329b18622de1daab41a0471fdae5043e   241747:
 f80915bb0b1d1f6677b7b81f19bd62636af05552   241743:
 cddace4f399a68cc263ae827e6094fb5b097eff6 v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/media/dvb/dvb-usb/technisat-usb2.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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();
 		}
 	}