leds: ns2: fix attribute-creation race

Use the attribute groups of the led-class to create the sata attribute
during probe in order to avoid racing with userspace.

Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Bryan Wu <cooloney@gmail.com>

diff --git a/drivers/leds/leds-ns2.c b/drivers/leds/leds-ns2.c
index efa625883c836359e42638285cdbc2d52cdb7220..231993d1fe21ad891e034c7fa22b3cbfb3e94b9a 100644 (file)
--- a/drivers/leds/leds-ns2.c
+++ b/drivers/leds/leds-ns2.c
@@ -185,6 +185,12 @@ static ssize_t ns2_led_sata_show(struct device *dev,
 
 static DEVICE_ATTR(sata, 0644, ns2_led_sata_show, ns2_led_sata_store);
 
+static struct attribute *ns2_led_attrs[] = {
+       &dev_attr_sata.attr,
+       NULL
+};
+ATTRIBUTE_GROUPS(ns2_led);
+
 static int
 create_ns2_led(struct platform_device *pdev, struct ns2_led_data *led_dat,
               const struct ns2_led *template)
@@ -219,6 +225,7 @@ create_ns2_led(struct platform_device *pdev, struct ns2_led_data *led_dat,
        led_dat->cdev.blink_set = NULL;
        led_dat->cdev.brightness_set = ns2_led_set;
        led_dat->cdev.flags |= LED_CORE_SUSPENDRESUME;
+       led_dat->cdev.groups = ns2_led_groups;
        led_dat->cmd = template->cmd;
        led_dat->slow = template->slow;
 
@@ -235,20 +242,11 @@ create_ns2_led(struct platform_device *pdev, struct ns2_led_data *led_dat,
        if (ret < 0)
                return ret;
 
-       ret = device_create_file(led_dat->cdev.dev, &dev_attr_sata);
-       if (ret < 0)
-               goto err_free_cdev;
-
        return 0;
-
-err_free_cdev:
-       led_classdev_unregister(&led_dat->cdev);
-       return ret;
 }
 
 static void delete_ns2_led(struct ns2_led_data *led_dat)
 {
-       device_remove_file(led_dat->cdev.dev, &dev_attr_sata);
        led_classdev_unregister(&led_dat->cdev);
 }