From 2147197a57d99c21bab0feeb6a3e0b16547a605b Mon Sep 17 00:00:00 2001 From: Russell King Date: Thu, 8 Jan 2009 12:27:00 +0000 Subject: [PATCH] --- yaml --- r: 127752 b: refs/heads/master c: d8f2f1808aa4a38e841cad59db0e5d1ec3a1b014 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/mouse/pxa930_trkball.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 604d63a3b37b..8ae8674b0eab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2927926707d07f846154842bc12bed6d817d9412 +refs/heads/master: d8f2f1808aa4a38e841cad59db0e5d1ec3a1b014 diff --git a/trunk/drivers/input/mouse/pxa930_trkball.c b/trunk/drivers/input/mouse/pxa930_trkball.c index a0f45c4fc198..d297accf9a7f 100644 --- a/trunk/drivers/input/mouse/pxa930_trkball.c +++ b/trunk/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 @@ static int __devinit pxa930_trkball_probe(struct platform_device *pdev) iounmap(trkball->mmio_base); failed: kfree(trkball); - return ret; + return error; } static int __devexit pxa930_trkball_remove(struct platform_device *pdev)