From b0aee7b1dcc8c893c75e03c518802db09e20f6cb Mon Sep 17 00:00:00 2001
From: Tobias Lorenz <tobias.lorenz@gmx.net>
Date: Mon, 28 Jan 2008 22:43:13 -0300
Subject: [PATCH] --- yaml --- r: 85731 b: refs/heads/master c:
 c3f686f152767b84893e474acd1a7758988dc369 h: refs/heads/master i:   85729:
 c7d6273175969720931d10203900ea810c6b289d   85727:
 8571c94b3fc907f0152a921e023d6f12a7be81cf v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/media/radio/radio-si470x.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 09c28f2e875c..f8f1795cb633 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 532fe65205253aef1ce5c0c76d2d8d303fb3fe71
+refs/heads/master: c3f686f152767b84893e474acd1a7758988dc369
diff --git a/trunk/drivers/media/radio/radio-si470x.c b/trunk/drivers/media/radio/radio-si470x.c
index a2975c8b0095..7fdee3cc6e02 100644
--- a/trunk/drivers/media/radio/radio-si470x.c
+++ b/trunk/drivers/media/radio/radio-si470x.c
@@ -1439,11 +1439,10 @@ static void si470x_usb_driver_disconnect(struct usb_interface *intf)
 {
 	struct si470x_device *radio = usb_get_intfdata(intf);
 
-	del_timer_sync(&radio->timer);
-	flush_scheduled_work();
-
 	usb_set_intfdata(intf, NULL);
 	if (radio) {
+	       del_timer_sync(&radio->timer);
+	       flush_scheduled_work();
 		video_unregister_device(radio->videodev);
 		kfree(radio->buffer);
 		kfree(radio);