diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-09-07 05:23:44 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-09-07 05:23:44 +0200 |
| commit | 07176b988ebb20f46a317a60ee1d983fe1630203 (patch) | |
| tree | e54affb1f823742078c68d9506e6035016bc2ea4 /drivers/input/serio/arc_ps2.c | |
| parent | Input: i8042 - disable the driver on ARC platforms (diff) | |
| parent | Input: add SYN_MAX and SYN_CNT constants (diff) | |
| download | linux-07176b988ebb20f46a317a60ee1d983fe1630203.tar.xz linux-07176b988ebb20f46a317a60ee1d983fe1630203.zip | |
Merge branch 'next' into for-linus
Merge first round of changes for 3.12 merge window.
Diffstat (limited to 'drivers/input/serio/arc_ps2.c')
| -rw-r--r-- | drivers/input/serio/arc_ps2.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/input/serio/arc_ps2.c b/drivers/input/serio/arc_ps2.c index 3fb7727c8ea5..8024a6d7fccb 100644 --- a/drivers/input/serio/arc_ps2.c +++ b/drivers/input/serio/arc_ps2.c @@ -189,12 +189,6 @@ static int arc_ps2_probe(struct platform_device *pdev) int irq; int error, id, i; - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) { - dev_err(&pdev->dev, "no IO memory defined\n"); - return -EINVAL; - } - irq = platform_get_irq_byname(pdev, "arc_ps2_irq"); if (irq < 0) { dev_err(&pdev->dev, "no IRQ defined\n"); @@ -208,6 +202,7 @@ static int arc_ps2_probe(struct platform_device *pdev) return -ENOMEM; } + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); arc_ps2->addr = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(arc_ps2->addr)) return PTR_ERR(arc_ps2->addr); |