iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

leds: lp55xx-common: fix attribute-creation race

Browse Source 
Use the attribute groups of the led-class to create the LED attributes
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>
This commit is contained in:
Johan Hovold 2014-06-25 10:08:56 -07:00 committed by Bryan Wu
parent 660216bf82
commit 44a1255b03
1 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/leds/leds-lp55xx-common.c
View File

@ -127,15 +127,12 @@ static DEVICE_ATTR(led_current, S_IRUGO | S_IWUSR, lp55xx_show_current,
lp55xx_store_current); lp55xx_store_current);
static DEVICE_ATTR(max_current, S_IRUGO , lp55xx_show_max_current, NULL); static DEVICE_ATTR(max_current, S_IRUGO , lp55xx_show_max_current, NULL);
static struct attribute *lp55xx_led_attributes[] = { static struct attribute *lp55xx_led_attrs[] = {
&dev_attr_led_current.attr, &dev_attr_led_current.attr,
&dev_attr_max_current.attr, &dev_attr_max_current.attr,
NULL, NULL,
}; };
ATTRIBUTE_GROUPS(lp55xx_led);
static struct attribute_group lp55xx_led_attr_group = {
.attrs = lp55xx_led_attributes
};
static void lp55xx_set_brightness(struct led_classdev *cdev, static void lp55xx_set_brightness(struct led_classdev *cdev,
enum led_brightness brightness) enum led_brightness brightness)
@ -176,6 +173,7 @@ static int lp55xx_init_led(struct lp55xx_led *led,
} }
led->cdev.brightness_set = lp55xx_set_brightness; led->cdev.brightness_set = lp55xx_set_brightness;
led->cdev.groups = lp55xx_led_groups;
if (pdata->led_config[chan].name) { if (pdata->led_config[chan].name) {
led->cdev.name = pdata->led_config[chan].name; led->cdev.name = pdata->led_config[chan].name;
@ -185,24 +183,12 @@ static int lp55xx_init_led(struct lp55xx_led *led,
led->cdev.name = name; led->cdev.name = name;
} }
/*
* register led class device for each channel and
* add device attributes
*/
ret = led_classdev_register(dev, &led->cdev); ret = led_classdev_register(dev, &led->cdev);
if (ret) { if (ret) {
dev_err(dev, "led register err: %d\n", ret); dev_err(dev, "led register err: %d\n", ret);
return ret; return ret;
} }
ret = sysfs_create_group(&led->cdev.dev->kobj, &lp55xx_led_attr_group);
if (ret) {
dev_err(dev, "led sysfs err: %d\n", ret);
led_classdev_unregister(&led->cdev);
return ret;
}
return 0; return 0;
} }
@ -520,8 +506,6 @@ void lp55xx_unregister_leds(struct lp55xx_led *led, struct lp55xx_chip *chip)
for (i = 0; i < chip->num_leds; i++) { for (i = 0; i < chip->num_leds; i++) {
each = led + i; each = led + i;
sysfs_remove_group(&each->cdev.dev->kobj,
&lp55xx_led_attr_group);
led_classdev_unregister(&each->cdev); led_classdev_unregister(&each->cdev);
flush_work(&each->brightness_work); flush_work(&each->brightness_work);
} }