1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/hid/hid-thingm.c b/drivers/hid/hid-thingm.c
index 134be89b15ea..b95d3978c272 100644
--- a/drivers/hid/hid-thingm.c
+++ b/drivers/hid/hid-thingm.c
@@ -208,10 +208,10 @@ unregister_red:
 
 static void thingm_remove_rgb(struct thingm_rgb *rgb)
 {
-        flush_work(&rgb->work);
         led_classdev_unregister(&rgb->red.ldev);
         led_classdev_unregister(&rgb->green.ldev);
         led_classdev_unregister(&rgb->blue.ldev);
+        flush_work(&rgb->work);
 }
 
 static int thingm_probe(struct hid_device *hdev, const struct hid_device_id *id)
@@ -250,6 +250,7 @@ static int thingm_probe(struct hid_device *hdev, const struct hid_device_id *id)
 
         if (!tdev->fwinfo) {
                 hid_err(hdev, "unsupported firmware %c\n", tdev->version.major);
+                err = -ENODEV;
                 goto stop;
         }
 
@@ -286,10 +287,10 @@ static void thingm_remove(struct hid_device *hdev)
         struct thingm_device *tdev = hid_get_drvdata(hdev);
         int i;
 
+        hid_hw_stop(hdev);
+
         for (i = 0; i < tdev->fwinfo->numrgb; ++i)
                 thingm_remove_rgb(tdev->rgb + i);
-
-        hid_hw_stop(hdev);
 }
 
 static const struct hid_device_id thingm_table[] = {