1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/usb/misc/usbled.c b/drivers/usb/misc/usbled.c
index 49c5c5c4c431..06cb71942dc7 100644
--- a/drivers/usb/misc/usbled.c
+++ b/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);