Skip to content

Commit

Permalink
leds: ss4200: fix attribute-creation race
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
jhovold authored and cooloney committed Jun 25, 2014
1 parent 475f854 commit 67bd8eb
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions drivers/leds/leds-ss4200.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down

0 comments on commit 67bd8eb

Please sign in to comment.