From bf533de3d128a0095b50f0dd6a531eb216f50c38 Mon Sep 17 00:00:00 2001 From: David Brownell Date: Wed, 31 Dec 2008 12:54:19 +0000 Subject: [PATCH] --- yaml --- r: 127862 b: refs/heads/master c: 6001e13c5f708eb68c744a69df3c2c281156030d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/regulator/core.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index df2f5ed69e09..db600834d769 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9fe5817f196054142b9a13ed78c73b76a29f2ea3 +refs/heads/master: 6001e13c5f708eb68c744a69df3c2c281156030d diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c index 7341c97cd916..f511a406fcaa 100644 --- a/trunk/drivers/regulator/core.c +++ b/trunk/drivers/regulator/core.c @@ -776,6 +776,20 @@ static int set_consumer_device_supply(struct regulator_dev *rdev, if (supply == NULL) return -EINVAL; + list_for_each_entry(node, ®ulator_map_list, list) { + if (consumer_dev != node->dev) + continue; + if (strcmp(node->supply, supply) != 0) + continue; + + dev_dbg(consumer_dev, "%s/%s is '%s' supply; fail %s/%s\n", + dev_name(&node->regulator->dev), + node->regulator->desc->name, + supply, + dev_name(&rdev->dev), rdev->desc->name); + return -EBUSY; + } + node = kmalloc(sizeof(struct regulator_map), GFP_KERNEL); if (node == NULL) return -ENOMEM;