diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-09-06 20:23:44 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-09-06 20:23:44 -0700 |
commit | 07176b988ebb20f46a317a60ee1d983fe1630203 (patch) | |
tree | e54affb1f823742078c68d9506e6035016bc2ea4 /drivers/input/serio/olpc_apsp.c | |
parent | fa46c7984092f3dbdbb3bcd7338d81a1168d9d2b (diff) | |
parent | 52764fed5049655926bcecaefd52f0a415ceb105 (diff) |
Merge branch 'next' into for-linus
Merge first round of changes for 3.12 merge window.
Diffstat (limited to 'drivers/input/serio/olpc_apsp.c')
-rw-r--r-- | drivers/input/serio/olpc_apsp.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/input/serio/olpc_apsp.c b/drivers/input/serio/olpc_apsp.c index 818aa466b5d2..51b1d40cc286 100644 --- a/drivers/input/serio/olpc_apsp.c +++ b/drivers/input/serio/olpc_apsp.c @@ -183,9 +183,6 @@ static int olpc_apsp_probe(struct platform_device *pdev) np = pdev->dev.of_node; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) - return -ENOENT; - priv->base = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(priv->base)) { dev_err(&pdev->dev, "Failed to map WTM registers\n"); |