diff options
author | Stephen Warren <swarren@nvidia.com> | 2012-02-20 01:45:50 -0500 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2012-02-22 11:59:33 -0500 |
commit | 9891d98c7ab5712807d87ab40f2a9acd9b317114 (patch) | |
tree | d603a0679ba787dff85b28c366d7fd657c0798f3 /drivers/pinctrl | |
parent | 128a06d4bb997d90158e668173a6944d376c84cb (diff) |
pinctrl: assume map table entries can't have a NULL ctrl_dev_name field
These are already disallowed. Clean up some code that doesn't assume this.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r-- | drivers/pinctrl/core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index b6e3c35c028e..552d8c115c4f 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c | |||
@@ -801,8 +801,7 @@ static int pinctrl_hog_maps(struct pinctrl_dev *pctldev) | |||
801 | 801 | ||
802 | mutex_lock(&pinctrl_maps_mutex); | 802 | mutex_lock(&pinctrl_maps_mutex); |
803 | for_each_maps(maps_node, i, map) { | 803 | for_each_maps(maps_node, i, map) { |
804 | if (map->ctrl_dev_name && | 804 | if (!strcmp(map->ctrl_dev_name, devname) && |
805 | !strcmp(map->ctrl_dev_name, devname) && | ||
806 | !strcmp(map->dev_name, devname)) { | 805 | !strcmp(map->dev_name, devname)) { |
807 | /* OK time to hog! */ | 806 | /* OK time to hog! */ |
808 | ret = pinctrl_hog_map(pctldev, map); | 807 | ret = pinctrl_hog_map(pctldev, map); |