From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 Oct 2012 11:14:07 +0000 (+0900)
Subject: Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney... 
X-Git-Tag: v3.7-rc1~60
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=c7a6ced9d8e8411bdafe83998474d185a79badc3;p=linux.git

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

Pull LED subsystem update from Bryan Wu.

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds: (24 commits)
  leds: add output driver configuration for pca9633 led driver
  leds: lm3642: Use regmap_update_bits() in lm3642_chip_init()
  leds: Add new LED driver for lm3642 chips
  leds-lp5523: Fix riskiness of the page fault
  leds-lp5523: turn off the LED engines on unloading the driver
  leds-lm3530: Fix smatch warnings
  leds-lm3530: Use devm_regulator_get function
  leds: leds-gpio: adopt pinctrl support
  leds: Add new LED driver for lm355x chips
  leds-lp5523: use the i2c device id rather than fixed name
  leds-lp5523: add new device id for LP55231
  leds-lp5523: support new LP55231 device
  leds: triggers: send uevent when changing triggers
  leds-lp5523: minor code style fixes
  leds-lp5523: change the return type of lp5523_set_mode()
  leds-lp5523: set the brightness to 0 forcely on removing the driver
  leds-lp5523: add channel name in the platform data
  leds: leds-gpio: Use of_get_child_count() helper
  leds: leds-gpio: Use platform_{get,set}_drvdata
  leds: leds-gpio: use of_match_ptr()
  ...
---

c7a6ced9d8e8411bdafe83998474d185a79badc3
diff --cc drivers/leds/leds-wm8350.c
index 4c62113f7a77,f5d9ac3ff161..88f23f845595
--- a/drivers/leds/leds-wm8350.c
+++ b/drivers/leds/leds-wm8350.c
@@@ -275,10 -262,8 +262,8 @@@ static int wm8350_led_remove(struct pla
  	struct wm8350_led *led = platform_get_drvdata(pdev);
  
  	led_classdev_unregister(&led->cdev);
 -	flush_work_sync(&led->work);
 +	flush_work(&led->work);
  	wm8350_led_disable(led);
- 	regulator_put(led->dcdc);
- 	regulator_put(led->isink);
  	return 0;
  }