From 6d4afbfb47e95535df366f109e19592d368d8b16 Mon Sep 17 00:00:00 2001 From: Sachin Kamat Date: Mon, 15 Apr 2013 13:38:07 -0700 Subject: [PATCH] --- yaml --- r: 368100 b: refs/heads/master c: e07a8943b809730220a4aff911d2bce6991828f1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/serio/apbps2.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 283ef16ca854..42834ff6a7db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 39fbe5855737b2a2b8e097373951bbe1a4fdb345 +refs/heads/master: e07a8943b809730220a4aff911d2bce6991828f1 diff --git a/trunk/drivers/input/serio/apbps2.c b/trunk/drivers/input/serio/apbps2.c index 2c14e6fa64c2..17e01a807ddc 100644 --- a/trunk/drivers/input/serio/apbps2.c +++ b/trunk/drivers/input/serio/apbps2.c @@ -147,11 +147,9 @@ static int apbps2_of_probe(struct platform_device *ofdev) /* Find Device Address */ res = platform_get_resource(ofdev, IORESOURCE_MEM, 0); - priv->regs = devm_request_and_ioremap(&ofdev->dev, res); - if (!priv->regs) { - dev_err(&ofdev->dev, "io-regs mapping failed\n"); - return -EBUSY; - } + priv->regs = devm_ioremap_resource(&ofdev->dev, res); + if (IS_ERR(priv->regs)) + return PTR_ERR(priv->regs); /* Reset hardware, disable interrupt */ iowrite32be(0, &priv->regs->ctrl);