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

Commit dea4f48a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'leds-fixes-for-3.13' of... 

Merge branch 'leds-fixes-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds

Pull LED subsystem bugfix from Bryan Wu.

* 'leds-fixes-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
  leds: pwm: Fix for deferred probe in DT booted mode
parents b6550287 aa1a6d6d

drivers/leds/leds-pwm.c

+26 −27
Original line number Diff line number Diff line
@@ -82,22 +82,12 @@ static inline size_t sizeof_pwm_leds_priv(int num_leds) 
		      (sizeof(struct led_pwm_data) * num_leds);

}



static struct led_pwm_priv *led_pwm_create_of(struct platform_device *pdev)

static int led_pwm_create_of(struct platform_device *pdev,

			     struct led_pwm_priv *priv)

{

	struct device_node *node = pdev->dev.of_node;

	struct device_node *child;

	struct led_pwm_priv *priv;

	int count, ret;



	/* count LEDs in this device, so we know how much to allocate */

	count = of_get_child_count(node);

	if (!count)

		return NULL;



	priv = devm_kzalloc(&pdev->dev, sizeof_pwm_leds_priv(count),

			    GFP_KERNEL);

	if (!priv)

		return NULL;

	int ret;



	for_each_child_of_node(node, child) {

		struct led_pwm_data *led_dat = &priv->leds[priv->num_leds];
@@ -109,6 +99,7 @@ static struct led_pwm_priv *led_pwm_create_of(struct platform_device *pdev) 
		if (IS_ERR(led_dat->pwm)) {

			dev_err(&pdev->dev, "unable to request PWM for %s\n",

				led_dat->cdev.name);

			ret = PTR_ERR(led_dat->pwm);

			goto err;

		}

		/* Get the period from PWM core when n*/
@@ -137,28 +128,36 @@ static struct led_pwm_priv *led_pwm_create_of(struct platform_device *pdev) 
		priv->num_leds++;

	}



	return priv;

	return 0;

err:

	while (priv->num_leds--)

		led_classdev_unregister(&priv->leds[priv->num_leds].cdev);



	return NULL;

	return ret;

}



static int led_pwm_probe(struct platform_device *pdev)

{

	struct led_pwm_platform_data *pdata = dev_get_platdata(&pdev->dev);

	struct led_pwm_priv *priv;

	int i, ret = 0;

	int count, i;

	int ret = 0;



	if (pdata)

		count = pdata->num_leds;

	else

		count = of_get_child_count(pdev->dev.of_node);



	if (!count)

		return -EINVAL;



	if (pdata && pdata->num_leds) {

		priv = devm_kzalloc(&pdev->dev,

				    sizeof_pwm_leds_priv(pdata->num_leds),

	priv = devm_kzalloc(&pdev->dev, sizeof_pwm_leds_priv(count),

			    GFP_KERNEL);

	if (!priv)

		return -ENOMEM;



		for (i = 0; i < pdata->num_leds; i++) {

	if (pdata) {

		for (i = 0; i < count; i++) {

			struct led_pwm *cur_led = &pdata->leds[i];

			struct led_pwm_data *led_dat = &priv->leds[i];
@@ -188,11 +187,11 @@ static int led_pwm_probe(struct platform_device *pdev) 
			if (ret < 0)

				goto err;

		}

		priv->num_leds = pdata->num_leds;

		priv->num_leds = count;

	} else {

		priv = led_pwm_create_of(pdev);

		if (!priv)

			return -ENODEV;

		ret = led_pwm_create_of(pdev, priv);

		if (ret)

			return ret;

	}



	platform_set_drvdata(pdev, priv);