From 9891d98c7ab5712807d87ab40f2a9acd9b317114 Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Sun, 19 Feb 2012 23:45:50 -0700 Subject: [PATCH] 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 Signed-off-by: Linus Walleij --- drivers/pinctrl/core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index b6e3c35..552d8c1 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); -- 2.7.4