From b4d707e00a80d454e9888c721bfc947db8ab9ab4 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Wed, 15 Jun 2011 10:32:06 -0300
Subject: [PATCH] --- yaml --- r: 261335 b: refs/heads/master c:
 fe45e2551f565c87559434205963fc56bbe205fa h: refs/heads/master i:   261333:
 a553fde9b0cf624111294a2533bdc9967d8458eb   261331:
 3acca8e979dee60c71b5930eb39211af1c1261cf   261327:
 7568b0d178c2af0efd0e2c0f372015b9313d577b v: v3

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

diff --git a/[refs] b/[refs]
index 60defded253e..0993f55bb739 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e1a4c1ff90002762998e0d13c8edc2e7aa8d736
+refs/heads/master: fe45e2551f565c87559434205963fc56bbe205fa
diff --git a/trunk/drivers/media/dvb/dvb-usb/technisat-usb2.c b/trunk/drivers/media/dvb/dvb-usb/technisat-usb2.c
index 08f8842ad280..473b95ed4d52 100644
--- a/trunk/drivers/media/dvb/dvb-usb/technisat-usb2.c
+++ b/trunk/drivers/media/dvb/dvb-usb/technisat-usb2.c
@@ -765,10 +765,8 @@ static void technisat_usb2_disconnect(struct usb_interface *intf)
 	/* work and stuff was only created when the device is is hot-state */
 	if (dev != NULL) {
 		struct technisat_usb2_state *state = dev->priv;
-		if (state != NULL) {
+		if (state != NULL)
 			cancel_delayed_work_sync(&state->green_led_work);
-			flush_scheduled_work();
-		}
 	}
 
 	dvb_usb_device_exit(intf);