From cd0ca3a1ada051b5b0b08de2feafc8f70567ae00 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 13 Sep 2012 21:48:14 +0200 Subject: [PATCH] --- yaml --- r: 328483 b: refs/heads/master c: 23a895aee6081c144ffcc61eaf52dc62e10b3bd1 h: refs/heads/master i: 328481: 3a86e3037eab25650db67db8a55e840a1758432c 328479: fb0bd054da1d56e2f2744726f5c8460addd5d0dc v: v3 --- [refs] | 2 +- trunk/drivers/pinctrl/pinmux.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 7e45c3e4abbc..e3102a279975 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e605cb68a21d5704839a192a46ebcf387773704 +refs/heads/master: 23a895aee6081c144ffcc61eaf52dc62e10b3bd1 diff --git a/trunk/drivers/pinctrl/pinmux.c b/trunk/drivers/pinctrl/pinmux.c index 3d5ac73bd5a7..9301a7a95eff 100644 --- a/trunk/drivers/pinctrl/pinmux.c +++ b/trunk/drivers/pinctrl/pinmux.c @@ -232,14 +232,11 @@ int pinmux_request_gpio(struct pinctrl_dev *pctldev, struct pinctrl_gpio_range *range, unsigned pin, unsigned gpio) { - char gpiostr[16]; const char *owner; int ret; /* Conjure some name stating what chip and pin this is taken by */ - snprintf(gpiostr, 15, "%s:%d", range->name, gpio); - - owner = kstrdup(gpiostr, GFP_KERNEL); + owner = kasprintf(GFP_KERNEL, "%s:%d", range->name, gpio); if (!owner) return -EINVAL;