summaryrefslogtreecommitdiff
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2012-02-20 10:45:50 +0400
committerLinus Walleij <linus.walleij@linaro.org>2012-02-22 20:59:33 +0400
commit9891d98c7ab5712807d87ab40f2a9acd9b317114 (patch)
treed603a0679ba787dff85b28c366d7fd657c0798f3 /drivers/pinctrl
parent128a06d4bb997d90158e668173a6944d376c84cb (diff)
downloadlinux-9891d98c7ab5712807d87ab40f2a9acd9b317114.tar.xz
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.c3
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)
mutex_lock(&pinctrl_maps_mutex);
for_each_maps(maps_node, i, map) {
- if (map->ctrl_dev_name &&
- !strcmp(map->ctrl_dev_name, devname) &&
+ if (!strcmp(map->ctrl_dev_name, devname) &&
!strcmp(map->dev_name, devname)) {
/* OK time to hog! */
ret = pinctrl_hog_map(pctldev, map);