From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 1 Nov 2012 14:36:59 +0000 (+0000)
Subject: Merge remote-tracking branches 'regulator/fix/gpio', 'regulator/fix/put', 'regulator... 
X-Git-Tag: next-20121102~51^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fe623cacd8fd758a93cc7526264a6ef02d4acaa7;p=karo-tx-linux.git

Merge remote-tracking branches 'regulator/fix/gpio', 'regulator/fix/put', 'regulator/topic/gpio', 'regulator/topic/lp8788', 'regulator/topic/max77686', 'regulator/topic/tps51632', 'regulator/topic/tps65910' and 'regulator/topic/vexpress' into regulator-next
---

fe623cacd8fd758a93cc7526264a6ef02d4acaa7
diff --cc drivers/regulator/core.c
index 5c4829cba6a6,aa4d28b5984e,e68754cfadc8,5c4829cba6a6,5c4829cba6a6,5c4829cba6a6,5c4829cba6a6,5c4829cba6a6,f7c74db7465c..b4a425a45293
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@@@@@@@@@ -3447,12 -3447,13 -3447,15 -3447,12 -3447,12 -3447,12 -3447,12 -3447,12 -3452,12 +3452,16 @@@@@@@@@@ scrub
         	if (rdev->ena_gpio)
         		gpio_free(rdev->ena_gpio);
         	kfree(rdev->constraints);
+ +++++++wash:
         	device_unregister(&rdev->dev);
++ ++++++
++ ++++++	mutex_unlock(&regulator_list_mutex);
++ ++++++	if (rdev->supply)
++ ++++++		regulator_put(rdev->supply);
++ ++++++
         	/* device core frees rdev */
         	rdev = ERR_PTR(ret);
-- ------	goto out;
++ ++++++	return rdev;
         
         clean:
         	kfree(rdev);