1 files changed, 72 insertions, 65 deletions

diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
index b9575de3e7e8..7b4efdfaae28 100644
--- a/drivers/media/radio/radio-shark2.c
+++ b/drivers/media/radio/radio-shark2.c
@@ -35,6 +35,11 @@
 #include <media/v4l2-device.h>
 #include "radio-tea5777.h"
 
+#if defined(CONFIG_LEDS_CLASS) || \
+    (defined(CONFIG_LEDS_CLASS_MODULE) && defined(CONFIG_RADIO_SHARK2_MODULE))
+#define SHARK_USE_LEDS 1
+#endif
+
 MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
 MODULE_DESCRIPTION("Griffin radioSHARK2, USB radio receiver driver");
 MODULE_LICENSE("GPL");
@@ -43,7 +48,6 @@ static int debug;
 module_param(debug, int, 0);
 MODULE_PARM_DESC(debug, "Debug level (0-1)");
 
-
 #define SHARK_IN_EP             0x83
 #define SHARK_OUT_EP            0x05
 
@@ -54,36 +58,18 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)");
 
 enum { BLUE_LED, RED_LED, NO_LEDS };
 
-static void shark_led_set_blue(struct led_classdev *led_cdev,
-                               enum led_brightness value);
-static void shark_led_set_red(struct led_classdev *led_cdev,
-                              enum led_brightness value);
-
-static const struct led_classdev shark_led_templates[NO_LEDS] = {
-        [BLUE_LED] = {
-                .name           = "%s:blue:",
-                .brightness     = LED_OFF,
-                .max_brightness = 127,
-                .brightness_set = shark_led_set_blue,
-        },
-        [RED_LED] = {
-                .name           = "%s:red:",
-                .brightness     = LED_OFF,
-                .max_brightness = 1,
-                .brightness_set = shark_led_set_red,
-        },
-};
-
 struct shark_device {
         struct usb_device *usbdev;
         struct v4l2_device v4l2_dev;
         struct radio_tea5777 tea;
 
+#ifdef SHARK_USE_LEDS
         struct work_struct led_work;
         struct led_classdev leds[NO_LEDS];
         char led_names[NO_LEDS][32];
         atomic_t brightness[NO_LEDS];
         unsigned long brightness_new;
+#endif
 
         u8 *transfer_buffer;
 };
@@ -161,18 +147,12 @@ static struct radio_tea5777_ops shark_tea_ops = {
         .read_reg  = shark_read_reg,
 };
 
+#ifdef SHARK_USE_LEDS
 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 +171,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,
@@ -217,19 +195,72 @@ static void shark_led_set_red(struct led_classdev *led_cdev,
         schedule_work(&shark->led_work);
 }
 
+static const struct led_classdev shark_led_templates[NO_LEDS] = {
+        [BLUE_LED] = {
+                .name           = "%s:blue:",
+                .brightness     = LED_OFF,
+                .max_brightness = 127,
+                .brightness_set = shark_led_set_blue,
+        },
+        [RED_LED] = {
+                .name           = "%s:red:",
+                .brightness     = LED_OFF,
+                .max_brightness = 1,
+                .brightness_set = shark_led_set_red,
+        },
+};
+
+static int shark_register_leds(struct shark_device *shark, struct device *dev)
+{
+        int i, retval;
+
+        INIT_WORK(&shark->led_work, shark_led_work);
+        for (i = 0; i < NO_LEDS; i++) {
+                shark->leds[i] = shark_led_templates[i];
+                snprintf(shark->led_names[i], sizeof(shark->led_names[0]),
+                         shark->leds[i].name, shark->v4l2_dev.name);
+                shark->leds[i].name = shark->led_names[i];
+                retval = led_classdev_register(dev, &shark->leds[i]);
+                if (retval) {
+                        v4l2_err(&shark->v4l2_dev,
+                                 "couldn't register led: %s\n",
+                                 shark->led_names[i]);
+                        return retval;
+                }
+        }
+        return 0;
+}
+
+static void shark_unregister_leds(struct shark_device *shark)
+{
+        int i;
+
+        for (i = 0; i < NO_LEDS; i++)
+                led_classdev_unregister(&shark->leds[i]);
+
+        cancel_work_sync(&shark->led_work);
+}
+#else
+static int shark_register_leds(struct shark_device *shark, struct device *dev)
+{
+        v4l2_warn(&shark->v4l2_dev,
+                  "CONFIG_LED_CLASS not enabled, LED support disabled\n");
+        return 0;
+}
+static inline void shark_unregister_leds(struct shark_device *shark) { }
+#endif
+
 static void usb_shark_disconnect(struct usb_interface *intf)
 {
         struct v4l2_device *v4l2_dev = usb_get_intfdata(intf);
         struct shark_device *shark = v4l2_dev_to_shark(v4l2_dev);
-        int i;
 
         mutex_lock(&shark->tea.mutex);
         v4l2_device_disconnect(&shark->v4l2_dev);
         radio_tea5777_exit(&shark->tea);
         mutex_unlock(&shark->tea.mutex);
 
-        for (i = 0; i < NO_LEDS; i++)
-                led_classdev_unregister(&shark->leds[i]);
+        shark_unregister_leds(shark);
 
         v4l2_device_put(&shark->v4l2_dev);
 }
@@ -238,7 +269,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);
@@ -248,7 +278,7 @@ static int usb_shark_probe(struct usb_interface *intf,
                            const struct usb_device_id *id)
 {
         struct shark_device *shark;
-        int i, retval = -ENOMEM;
+        int retval = -ENOMEM;
 
         shark = kzalloc(sizeof(struct shark_device), GFP_KERNEL);
         if (!shark)
@@ -258,17 +288,13 @@ static int usb_shark_probe(struct usb_interface *intf,
         if (!shark->transfer_buffer)
                 goto err_alloc_buffer;
 
-        /*
-         * Work around a bug in usbhid/hid-core.c, where it leaves a dangling
-         * pointer in intfdata causing v4l2-device.c to not set it. Which
-         * results in usb_shark_disconnect() referencing the dangling pointer
-         *
-         * REMOVE (as soon as the above bug is fixed, patch submitted)
-         */
-        usb_set_intfdata(intf, NULL);
+        v4l2_device_set_name(&shark->v4l2_dev, DRV_NAME, &shark_instance);
+
+        retval = shark_register_leds(shark, &intf->dev);
+        if (retval)
+                goto err_reg_leds;
 
         shark->v4l2_dev.release = usb_shark_release;
-        v4l2_device_set_name(&shark->v4l2_dev, DRV_NAME, &shark_instance);
         retval = v4l2_device_register(&intf->dev, &shark->v4l2_dev);
         if (retval) {
                 v4l2_err(&shark->v4l2_dev, "couldn't register v4l2_device\n");
@@ -292,32 +318,13 @@ static int usb_shark_probe(struct usb_interface *intf,
                 goto err_init_tea;
         }
 
-        INIT_WORK(&shark->led_work, shark_led_work);
-        for (i = 0; i < NO_LEDS; i++) {
-                shark->leds[i] = shark_led_templates[i];
-                snprintf(shark->led_names[i], sizeof(shark->led_names[0]),
-                         shark->leds[i].name, shark->v4l2_dev.name);
-                shark->leds[i].name = shark->led_names[i];
-                /*
-                 * We don't fail the probe if we fail to register the leds,
-                 * because once we've called radio_tea5777_init, the /dev/radio0
-                 * node may be opened from userspace holding a reference to us!
-                 *
-                 * Note we cannot register the leds first instead as
-                 * shark_led_work depends on the v4l2 mutex and registered bit.
-                 */
-                retval = led_classdev_register(&intf->dev, &shark->leds[i]);
-                if (retval)
-                        v4l2_err(&shark->v4l2_dev,
-                                 "couldn't register led: %s\n",
-                                 shark->led_names[i]);
-        }
-
         return 0;
 
 err_init_tea:
         v4l2_device_unregister(&shark->v4l2_dev);
 err_reg_dev:
+        shark_unregister_leds(shark);
+err_reg_leds:
         kfree(shark->transfer_buffer);
 err_alloc_buffer:
         kfree(shark);