From be728c4a86f204fa20aeea0ec1044505fd7882b6 Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Sun, 19 Feb 2012 23:45:50 -0700 Subject: [PATCH] --- yaml --- r: 294073 b: refs/heads/master c: 9891d98c7ab5712807d87ab40f2a9acd9b317114 h: refs/heads/master i: 294071: 04ca3506436bbf4cf9802683b50fb16f4468eeeb v: v3 --- [refs] | 2 +- trunk/drivers/pinctrl/core.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cb54b7611a57..9b1c4584b866 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 128a06d4bb997d90158e668173a6944d376c84cb +refs/heads/master: 9891d98c7ab5712807d87ab40f2a9acd9b317114 diff --git a/trunk/drivers/pinctrl/core.c b/trunk/drivers/pinctrl/core.c index b6e3c35c028e..552d8c115c4f 100644 --- a/trunk/drivers/pinctrl/core.c +++ b/trunk/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);