Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 328483
b: refs/heads/master
c: 23a895a
h: refs/heads/master
i:
  328481: 3a86e30
  328479: fb0bd05
v: v3
  • Loading branch information
Thomas Petazzoni authored and Linus Walleij committed Sep 14, 2012
1 parent 586d15c commit cd0ca3a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9e605cb68a21d5704839a192a46ebcf387773704
refs/heads/master: 23a895aee6081c144ffcc61eaf52dc62e10b3bd1
5 changes: 1 addition & 4 deletions trunk/drivers/pinctrl/pinmux.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit cd0ca3a

Please sign in to comment.