qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drivers: irq: malloc a temporary string for strtok 

strtok will update original input string.

Change-Id: I9c81a72045f057c8a7d17f688e2d9f70dd849880
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
This commit is contained in:
Joseph Chen 2017-09-29 09:14:20 +08:00 committed by Kever Yang
parent 64c74e0b2d
commit dbcd148475
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/irq/irq-gpio-switch.c
View File

@ -89,19 +89,25 @@ static int _irq_to_gpio(int irq)
int gpio_to_irq(struct gpio_desc *gpio) int gpio_to_irq(struct gpio_desc *gpio)
{ {
int irq_gpio, bank; int irq_gpio, bank, ret = EINVAL_GPIO;
bool found; bool found;
char *name; char *name, *name_tok;
if (!gpio->dev->name) { if (!gpio->dev->name) {
printf("can't find device name for the gpio bank\n"); printf("can't find device name for the gpio bank\n");
return EINVAL_GPIO; return EINVAL_GPIO;
} }
name = strtok((char *)gpio->dev->name, "@"); name_tok = strdup(gpio->dev->name);
if (!name_tok) {
printf("Error: strdup in %s failed!\n", __func__);
return -ENOMEM;
}
name = strtok(name_tok, "@");
if (!name) { if (!name) {
printf("can't find correct device name for the gpio bank\n"); printf("can't find correct device name for the gpio bank\n");
return EINVAL_GPIO; goto out;
} }
for (bank = 0; bank < ARRAY_SIZE(gpio_banks); bank++) { for (bank = 0; bank < ARRAY_SIZE(gpio_banks); bank++) {
@ -113,14 +119,19 @@ int gpio_to_irq(struct gpio_desc *gpio)
if (!found) { if (!found) {
printf("irq gpio framework can't find %s\n", name); printf("irq gpio framework can't find %s\n", name);
return EINVAL_GPIO; goto out;
} }
irq_gpio = RK_IRQ_GPIO(bank, gpio->offset); irq_gpio = RK_IRQ_GPIO(bank, gpio->offset);
if (!gpio_is_valid(irq_gpio)) if (!gpio_is_valid(irq_gpio))
return EINVAL_GPIO; goto out;
free(name_tok);
return _hard_gpio_to_irq(irq_gpio); return _hard_gpio_to_irq(irq_gpio);
out:
free(name_tok);
return ret;
} }
int hard_gpio_to_irq(u32 gpio) int hard_gpio_to_irq(u32 gpio)