From: Stephen Warren Date: Mon, 20 Feb 2012 06:45:50 +0000 (-0700) Subject: pinctrl: assume map table entries can't have a NULL ctrl_dev_name field X-Git-Tag: v3.4-rc1~128^2~31 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9891d98c7ab5712807d87ab40f2a9acd9b317114;p=karo-tx-linux.git 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 --- 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);