From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 22 Aug 2012 05:02:05 +0000 (+1000)
Subject: Merge remote-tracking branch 'leds/for-next'
X-Git-Tag: next-20120822~20
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=399789b525d837066749b7a6ae2784c719d1622d;p=karo-tx-linux.git

Merge remote-tracking branch 'leds/for-next'
---

399789b525d837066749b7a6ae2784c719d1622d
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;
  }