Merge tag 'for-v3.13/clock-fixes-a' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / drivers / pinctrl / pinmux.c

diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c
index 9d144a2..9248ce4 100644 (file)
--- a/drivers/pinctrl/pinmux.c
+++ b/drivers/pinctrl/pinmux.c
@@ -505,16 +505,14 @@ void pinmux_disable_setting(struct pinctrl_setting const *setting)
                        pin_free(pctldev, pins[i], NULL);
                } else {
                        const char *gname;
-                       const char *pname;
 
-                       pname = desc ? desc->name : "non-existing";
                        gname = pctlops->get_group_name(pctldev,
                                                setting->data.mux.group);
                        dev_warn(pctldev->dev,
                                 "not freeing pin %d (%s) as part of "
                                 "deactivating group %s - it is already "
                                 "used for some other setting",
-                                pins[i], pname, gname);
+                                pins[i], desc->name, gname);
                }
        }