From 6ce873e73798db022f46fc2bbdefca388b686a7f Mon Sep 17 00:00:00 2001
From: Oliver Neukum <oliver@neukum.org>
Date: Sun, 28 Oct 2007 08:21:59 +0100
Subject: [PATCH] --- yaml --- r: 74321 b: refs/heads/master c:
 ed206ec9ab398e1c3756ff0eb9507db1d009e65f h: refs/heads/master i:   74319:
 df4a13206a4e706f35d338bc50f80cf797d3f09f v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/usb/misc/usbled.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 19c6ea3824f6..466c00285f34 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ced46c3ad1dfaaabf9ec6c98cbb0a48e080fb11
+refs/heads/master: ed206ec9ab398e1c3756ff0eb9507db1d009e65f
diff --git a/trunk/drivers/usb/misc/usbled.c b/trunk/drivers/usb/misc/usbled.c
index 49c5c5c4c431..06cb71942dc7 100644
--- a/trunk/drivers/usb/misc/usbled.c
+++ b/trunk/drivers/usb/misc/usbled.c
@@ -144,12 +144,14 @@ static void led_disconnect(struct usb_interface *interface)
 	struct usb_led *dev;
 
 	dev = usb_get_intfdata (interface);
-	usb_set_intfdata (interface, NULL);
 
 	device_remove_file(&interface->dev, &dev_attr_blue);
 	device_remove_file(&interface->dev, &dev_attr_red);
 	device_remove_file(&interface->dev, &dev_attr_green);
 
+	/* first remove the files, then set the pointer to NULL */
+	usb_set_intfdata (interface, NULL);
+
 	usb_put_dev(dev->udev);
 
 	kfree(dev);