]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
regulator: lock supply in regulator enable
authorMattias Wallin <mattias.wallin@stericsson.com>
Thu, 4 Nov 2010 10:01:31 +0000 (11:01 +0100)
committerLiam Girdwood <lrg@slimlogic.co.uk>
Tue, 30 Nov 2010 15:13:25 +0000 (15:13 +0000)
This patch add locks around regulator supply enable.

Signed-off-by: Mattias Wallin <mattias.wallin@stericsson.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
drivers/regulator/core.c

index 711fa1722bcea6aae685c2c1d2dc0c1bb8ba168e..27d062e1395c30411ec4a1f20b06e2d455d62f4a 100644 (file)
@@ -1269,7 +1269,9 @@ static int _regulator_enable(struct regulator_dev *rdev)
 
        /* do we need to enable the supply regulator first */
        if (rdev->supply) {
+               mutex_lock(&rdev->supply->mutex);
                ret = _regulator_enable(rdev->supply);
+               mutex_unlock(&rdev->supply->mutex);
                if (ret < 0) {
                        printk(KERN_ERR "%s: failed to enable %s: %d\n",
                               __func__, rdev_get_name(rdev), ret);