Commit e5971bbc authored by Simon Guinot's avatar Simon Guinot Committed by Nicolas Pitre
Browse files

leds: leds-ns2: fix private driver data storage 



dev_set_drvdata() can't be used to set the driver private data pointer.
This would overwrite the led classdev object previously registered by
led_classdev_register().

Note that despite this mistake, the driver work fine because led_dat and
led_dat->cdev are at the same memory address.

Signed-off-by: default avatarSimon Guinot <sguinot@lacie.com>
Signed-off-by: default avatarNicolas Pitre <nico@fluxnic.net>
parent b51d92da

drivers/leds/leds-ns2.c

+6 −3
Original line number Original line Diff line number Diff line
@@ -141,10 +141,12 @@ static ssize_t ns2_led_sata_store(struct device *dev, 
				  struct device_attribute *attr,

				  struct device_attribute *attr,

				  const char *buff, size_t count)

				  const char *buff, size_t count)

{

{

	struct led_classdev *led_cdev = dev_get_drvdata(dev);

	struct ns2_led_data *led_dat =

		container_of(led_cdev, struct ns2_led_data, cdev);

	int ret;

	int ret;

	unsigned long enable;

	unsigned long enable;

	enum ns2_led_modes mode;

	enum ns2_led_modes mode;

	struct ns2_led_data *led_dat = dev_get_drvdata(dev);





	ret = strict_strtoul(buff, 10, &enable);

	ret = strict_strtoul(buff, 10, &enable);

	if (ret < 0)

	if (ret < 0)
@@ -172,7 +174,9 @@ static ssize_t ns2_led_sata_store(struct device *dev, 
static ssize_t ns2_led_sata_show(struct device *dev,

static ssize_t ns2_led_sata_show(struct device *dev,

				 struct device_attribute *attr, char *buf)

				 struct device_attribute *attr, char *buf)

{

{

	struct ns2_led_data *led_dat = dev_get_drvdata(dev);

	struct led_classdev *led_cdev = dev_get_drvdata(dev);

	struct ns2_led_data *led_dat =

		container_of(led_cdev, struct ns2_led_data, cdev);





	return sprintf(buf, "%d\n", led_dat->sata);

	return sprintf(buf, "%d\n", led_dat->sata);

}

}
@@ -234,7 +238,6 @@ create_ns2_led(struct platform_device *pdev, struct ns2_led_data *led_dat, 
	if (ret < 0)

	if (ret < 0)

		goto err_free_slow;

		goto err_free_slow;





	dev_set_drvdata(led_dat->cdev.dev, led_dat);

	ret = device_create_file(led_dat->cdev.dev, &dev_attr_sata);

	ret = device_create_file(led_dat->cdev.dev, &dev_attr_sata);

	if (ret < 0)

	if (ret < 0)

		goto err_free_cdev;

		goto err_free_cdev;

CRA Git | Maintained and supported by SUSTech CRA and CCSE