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

Commit 3bf671af authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull leds fixes/revert from Bryan Wu.

* 'fixes-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
  leds: renesas: fix error handling
  Revert "leds: use led_set_brightness in led_trigger_event"
  leds: lp8788: Fix updating scale configuration bits
parents 1c212c65 4a5a4184

drivers/leds/led-triggers.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -224,7 +224,7 @@ void led_trigger_event(struct led_trigger *trig, 
		struct led_classdev *led_cdev;

		struct led_classdev *led_cdev;





		led_cdev = list_entry(entry, struct led_classdev, trig_list);

		led_cdev = list_entry(entry, struct led_classdev, trig_list);

		led_set_brightness(led_cdev, brightness);

		__led_set_brightness(led_cdev, brightness);

	}

	}

	read_unlock(&trig->leddev_list_lock);

	read_unlock(&trig->leddev_list_lock);

}

}

drivers/leds/leds-lp8788.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -63,7 +63,7 @@ static int lp8788_led_init_device(struct lp8788_led *led, 
	/* scale configuration */

	/* scale configuration */

	addr = LP8788_ISINK_CTRL;

	addr = LP8788_ISINK_CTRL;

	mask = 1 << (cfg->num + LP8788_ISINK_SCALE_OFFSET);

	mask = 1 << (cfg->num + LP8788_ISINK_SCALE_OFFSET);

	val = cfg->scale << cfg->num;

	val = cfg->scale << (cfg->num + LP8788_ISINK_SCALE_OFFSET);

	ret = lp8788_update_bits(led->lp, addr, mask, val);

	ret = lp8788_update_bits(led->lp, addr, mask, val);

	if (ret)

	if (ret)

		return ret;

		return ret;

drivers/leds/leds-renesas-tpu.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -247,7 +247,7 @@ static int __devinit r_tpu_probe(struct platform_device *pdev) 




	if (!cfg) {

	if (!cfg) {

		dev_err(&pdev->dev, "missing platform data\n");

		dev_err(&pdev->dev, "missing platform data\n");

		goto err0;

		return -ENODEV;

	}

	}





	p = devm_kzalloc(&pdev->dev, sizeof(*p), GFP_KERNEL);

	p = devm_kzalloc(&pdev->dev, sizeof(*p), GFP_KERNEL);