diff options
| author | Johan Hovold <johan@kernel.org> | 2014-06-25 10:08:52 -0700 |
|---|---|---|
| committer | Bryan Wu <cooloney@gmail.com> | 2014-06-25 15:34:24 -0700 |
| commit | 67bd8eb07eb873fe0b189ee2a9a9ca67f9023270 (patch) | |
| tree | 875ffc309e6a220c721219188ebed2e2c3a80f0e | |
| parent | 475f85482663985550e589496bc3c1e09521838a (diff) | |
| download | linux-stable-67bd8eb07eb873fe0b189ee2a9a9ca67f9023270.tar.gz linux-stable-67bd8eb07eb873fe0b189ee2a9a9ca67f9023270.tar.bz2 linux-stable-67bd8eb07eb873fe0b189ee2a9a9ca67f9023270.zip | |
leds: ss4200: fix attribute-creation race
Use the attribute groups of the led-class to create the blink 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>
| -rw-r--r-- | drivers/leds/leds-ss4200.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/leds/leds-ss4200.c b/drivers/leds/leds-ss4200.c index 2eb3ef62962b..046cb7008745 100644 --- a/drivers/leds/leds-ss4200.c +++ b/drivers/leds/leds-ss4200.c @@ -469,6 +469,12 @@ static ssize_t nas_led_blink_store(struct device *dev, static DEVICE_ATTR(blink, 0644, nas_led_blink_show, nas_led_blink_store); +static struct attribute *nasgpio_led_attrs[] = { + &dev_attr_blink.attr, + NULL +}; +ATTRIBUTE_GROUPS(nasgpio_led); + static int register_nasgpio_led(int led_nr) { int ret; @@ -481,20 +487,18 @@ static int register_nasgpio_led(int led_nr) led->brightness = LED_FULL; led->brightness_set = nasgpio_led_set_brightness; led->blink_set = nasgpio_led_set_blink; + led->groups = nasgpio_led_groups; ret = led_classdev_register(&nas_gpio_pci_dev->dev, led); if (ret) return ret; - ret = device_create_file(led->dev, &dev_attr_blink); - if (ret) - led_classdev_unregister(led); - return ret; + + return 0; } static void unregister_nasgpio_led(int led_nr) { struct led_classdev *led = get_classdev_for_led_nr(led_nr); led_classdev_unregister(led); - device_remove_file(led->dev, &dev_attr_blink); } /* * module load/initialization |