2 files changed, 4 insertions, 21 deletions

diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
index e35b8d938a30..1d76afa9e1b7 100644
--- a/drivers/media/radio/radio-shark.c
+++ b/drivers/media/radio/radio-shark.c
@@ -181,14 +181,6 @@ static void shark_led_work(struct work_struct *work)
                 container_of(work, struct shark_device, led_work);
         int i, res, brightness, actual_len;
 
-        /*
-         * We use the v4l2_dev lock and registered bit to ensure the device
-         * does not get unplugged and unreffed while we're running.
-         */
-        mutex_lock(&shark->tea.mutex);
-        if (!video_is_registered(&shark->tea.vd))
-                goto leave;
-
         for (i = 0; i < 3; i++) {
                 if (!test_and_clear_bit(i, &shark->brightness_new))
                         continue;
@@ -208,8 +200,6 @@ static void shark_led_work(struct work_struct *work)
                         v4l2_err(&shark->v4l2_dev, "set LED %s error: %d\n",
                                  shark->led_names[i], res);
         }
-leave:
-        mutex_unlock(&shark->tea.mutex);
 }
 
 static void shark_led_set_blue(struct led_classdev *led_cdev,
@@ -259,6 +249,8 @@ static void usb_shark_disconnect(struct usb_interface *intf)
         for (i = 0; i < NO_LEDS; i++)
                 led_classdev_unregister(&shark->leds[i]);
 
+        cancel_work_sync(&shark->led_work);
+
         v4l2_device_put(&shark->v4l2_dev);
 }
 
@@ -266,7 +258,6 @@ static void usb_shark_release(struct v4l2_device *v4l2_dev)
 {
         struct shark_device *shark = v4l2_dev_to_shark(v4l2_dev);
 
-        cancel_work_sync(&shark->led_work);
         v4l2_device_unregister(&shark->v4l2_dev);
         kfree(shark->transfer_buffer);
         kfree(shark);
diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
index fc0289d5da4e..217483ca1b18 100644
--- a/drivers/media/radio/radio-shark2.c
+++ b/drivers/media/radio/radio-shark2.c
@@ -166,13 +166,6 @@ static void shark_led_work(struct work_struct *work)
         struct shark_device *shark =
                 container_of(work, struct shark_device, led_work);
         int i, res, brightness, actual_len;
-        /*
-         * We use the v4l2_dev lock and registered bit to ensure the device
-         * does not get unplugged and unreffed while we're running.
-         */
-        mutex_lock(&shark->tea.mutex);
-        if (!video_is_registered(&shark->tea.vd))
-                goto leave;
 
         for (i = 0; i < 2; i++) {
                 if (!test_and_clear_bit(i, &shark->brightness_new))
@@ -191,8 +184,6 @@ static void shark_led_work(struct work_struct *work)
                         v4l2_err(&shark->v4l2_dev, "set LED %s error: %d\n",
                                  shark->led_names[i], res);
         }
-leave:
-        mutex_unlock(&shark->tea.mutex);
 }
 
 static void shark_led_set_blue(struct led_classdev *led_cdev,
@@ -231,6 +222,8 @@ static void usb_shark_disconnect(struct usb_interface *intf)
         for (i = 0; i < NO_LEDS; i++)
                 led_classdev_unregister(&shark->leds[i]);
 
+        cancel_work_sync(&shark->led_work);
+
         v4l2_device_put(&shark->v4l2_dev);
 }
 
@@ -238,7 +231,6 @@ static void usb_shark_release(struct v4l2_device *v4l2_dev)
 {
         struct shark_device *shark = v4l2_dev_to_shark(v4l2_dev);
 
-        cancel_work_sync(&shark->led_work);
         v4l2_device_unregister(&shark->v4l2_dev);
         kfree(shark->transfer_buffer);
         kfree(shark);