Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74c85039 authored by Johan Hovold's avatar Johan Hovold Committed by Bryan Wu
Browse files

leds: lm3550: fix attribute-creation race 



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

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarBryan Wu <cooloney@gmail.com>
parent d0d480cc

drivers/leds/leds-lm3530.c

+7 −13
Original line number Original line Diff line number Diff line
@@ -400,6 +400,12 @@ static ssize_t lm3530_mode_set(struct device *dev, struct device_attribute 
}

}

static DEVICE_ATTR(mode, 0644, lm3530_mode_get, lm3530_mode_set);

static DEVICE_ATTR(mode, 0644, lm3530_mode_get, lm3530_mode_set);





static struct attribute *lm3530_attrs[] = {

	&dev_attr_mode.attr,

	NULL

};

ATTRIBUTE_GROUPS(lm3530);



static int lm3530_probe(struct i2c_client *client,

static int lm3530_probe(struct i2c_client *client,

			   const struct i2c_device_id *id)

			   const struct i2c_device_id *id)

{

{
@@ -436,6 +442,7 @@ static int lm3530_probe(struct i2c_client *client, 
	drvdata->led_dev.name = LM3530_LED_DEV;

	drvdata->led_dev.name = LM3530_LED_DEV;

	drvdata->led_dev.brightness_set = lm3530_brightness_set;

	drvdata->led_dev.brightness_set = lm3530_brightness_set;

	drvdata->led_dev.max_brightness = MAX_BRIGHTNESS;

	drvdata->led_dev.max_brightness = MAX_BRIGHTNESS;

	drvdata->led_dev.groups = lm3530_groups;





	i2c_set_clientdata(client, drvdata);

	i2c_set_clientdata(client, drvdata);
@@ -461,26 +468,13 @@ static int lm3530_probe(struct i2c_client *client, 
		return err;

		return err;

	}

	}





	err = device_create_file(drvdata->led_dev.dev, &dev_attr_mode);

	if (err < 0) {

		dev_err(&client->dev, "File device creation failed: %d\n", err);

		err = -ENODEV;

		goto err_create_file;

	}



	return 0;

	return 0;



err_create_file:

	led_classdev_unregister(&drvdata->led_dev);

	return err;

}

}





static int lm3530_remove(struct i2c_client *client)

static int lm3530_remove(struct i2c_client *client)

{

{

	struct lm3530_data *drvdata = i2c_get_clientdata(client);

	struct lm3530_data *drvdata = i2c_get_clientdata(client);





	device_remove_file(drvdata->led_dev.dev, &dev_attr_mode);



	lm3530_led_disable(drvdata);

	lm3530_led_disable(drvdata);

	led_classdev_unregister(&drvdata->led_dev);

	led_classdev_unregister(&drvdata->led_dev);

	return 0;

	return 0;