Merge branches 'gpio/merge' and 'spi/merge' of git://git.secretlab.ca/git/linux-2.6

[~andy/linux] / drivers / misc / spear13xx_pcie_gadget.c

diff --git a/drivers/misc/spear13xx_pcie_gadget.c b/drivers/misc/spear13xx_pcie_gadget.c
index ec3b8c911833de75bf49f2d9847ec673681a3484..cfbddbef11de3b67c54be85797dd124843ca8596 100644 (file)
--- a/drivers/misc/spear13xx_pcie_gadget.c
+++ b/drivers/misc/spear13xx_pcie_gadget.c
@@ -787,8 +787,8 @@ static int __devinit spear_pcie_gadget_probe(struct platform_device *pdev)
 
        status = request_irq(irq, spear_pcie_gadget_irq, 0, pdev->name, NULL);
        if (status) {
-               dev_err(&pdev->dev, "pcie gadget interrupt IRQ%d already \
-                               claimed\n", irq);
+               dev_err(&pdev->dev,
+                       "pcie gadget interrupt IRQ%d already claimed\n", irq);
                goto err_iounmap;
        }
 
@@ -845,7 +845,7 @@ err_iounmap:
 err_iounmap_app:
        iounmap(config->va_app_base);
 err_kzalloc:
-       kfree(config);
+       kfree(target);
 err_rel_res:
        release_mem_region(res1->start, resource_size(res1));
 err_rel_res0: