gpio: mvebu: Don't free chip label memory
The gpio_chip.label field is a const char * and assigned the value of a call to dev_name(). Memory obtained from dev_name() should not be freed by drivers. Acked-by: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
parent
6948ce588b
commit
11c0ceec07
|
@ -547,7 +547,6 @@ static int mvebu_gpio_probe(struct platform_device *pdev)
|
||||||
mvchip->membase = devm_request_and_ioremap(&pdev->dev, res);
|
mvchip->membase = devm_request_and_ioremap(&pdev->dev, res);
|
||||||
if (! mvchip->membase) {
|
if (! mvchip->membase) {
|
||||||
dev_err(&pdev->dev, "Cannot ioremap\n");
|
dev_err(&pdev->dev, "Cannot ioremap\n");
|
||||||
kfree(mvchip->chip.label);
|
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -557,14 +556,12 @@ static int mvebu_gpio_probe(struct platform_device *pdev)
|
||||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
|
||||||
if (! res) {
|
if (! res) {
|
||||||
dev_err(&pdev->dev, "Cannot get memory resource\n");
|
dev_err(&pdev->dev, "Cannot get memory resource\n");
|
||||||
kfree(mvchip->chip.label);
|
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
|
|
||||||
mvchip->percpu_membase = devm_request_and_ioremap(&pdev->dev, res);
|
mvchip->percpu_membase = devm_request_and_ioremap(&pdev->dev, res);
|
||||||
if (! mvchip->percpu_membase) {
|
if (! mvchip->percpu_membase) {
|
||||||
dev_err(&pdev->dev, "Cannot ioremap\n");
|
dev_err(&pdev->dev, "Cannot ioremap\n");
|
||||||
kfree(mvchip->chip.label);
|
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -625,7 +622,6 @@ static int mvebu_gpio_probe(struct platform_device *pdev)
|
||||||
mvchip->irqbase = irq_alloc_descs(-1, 0, ngpios, -1);
|
mvchip->irqbase = irq_alloc_descs(-1, 0, ngpios, -1);
|
||||||
if (mvchip->irqbase < 0) {
|
if (mvchip->irqbase < 0) {
|
||||||
dev_err(&pdev->dev, "no irqs\n");
|
dev_err(&pdev->dev, "no irqs\n");
|
||||||
kfree(mvchip->chip.label);
|
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -633,7 +629,6 @@ static int mvebu_gpio_probe(struct platform_device *pdev)
|
||||||
mvchip->membase, handle_level_irq);
|
mvchip->membase, handle_level_irq);
|
||||||
if (! gc) {
|
if (! gc) {
|
||||||
dev_err(&pdev->dev, "Cannot allocate generic irq_chip\n");
|
dev_err(&pdev->dev, "Cannot allocate generic irq_chip\n");
|
||||||
kfree(mvchip->chip.label);
|
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -668,7 +663,6 @@ static int mvebu_gpio_probe(struct platform_device *pdev)
|
||||||
irq_remove_generic_chip(gc, IRQ_MSK(ngpios), IRQ_NOREQUEST,
|
irq_remove_generic_chip(gc, IRQ_MSK(ngpios), IRQ_NOREQUEST,
|
||||||
IRQ_LEVEL | IRQ_NOPROBE);
|
IRQ_LEVEL | IRQ_NOPROBE);
|
||||||
kfree(gc);
|
kfree(gc);
|
||||||
kfree(mvchip->chip.label);
|
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Reference in New Issue