Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-omap-h63xx.git] / drivers / input / mouse / pxa930_trkball.c

diff --git a/drivers/input/mouse/pxa930_trkball.c b/drivers/input/mouse/pxa930_trkball.c
index 784be69b711288240cb56cb6dc8820161e8132fe..1e827ad0afbedd58a36438cb1fe23e4a0ad3adf8 100644 (file)
--- a/drivers/input/mouse/pxa930_trkball.c
+++ b/drivers/input/mouse/pxa930_trkball.c
@@ -186,7 +186,7 @@ static int __devinit pxa930_trkball_probe(struct platform_device *pdev)
        error = request_irq(irq, pxa930_trkball_interrupt, IRQF_DISABLED,
                            pdev->name, trkball);
        if (error) {
-               dev_err(&pdev->dev, "failed to request irq: %d\n", ret);
+               dev_err(&pdev->dev, "failed to request irq: %d\n", error);
                goto failed_free_io;
        }
 
@@ -227,7 +227,7 @@ failed_free_io:
        iounmap(trkball->mmio_base);
 failed:
        kfree(trkball);
-       return ret;
+       return error;
 }
 
 static int __devexit pxa930_trkball_remove(struct platform_device *pdev)