1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/misc/atmel-ssc.c b/drivers/misc/atmel-ssc.c
index 3c09cbb70b1d..c09c28f92055 100644
--- a/drivers/misc/atmel-ssc.c
+++ b/drivers/misc/atmel-ssc.c
@@ -159,11 +159,9 @@ static int ssc_probe(struct platform_device *pdev)
                 return -ENXIO;
         }
 
-        ssc->regs = devm_request_and_ioremap(&pdev->dev, regs);
-        if (!ssc->regs) {
-                dev_dbg(&pdev->dev, "ioremap failed\n");
-                return -EINVAL;
-        }
+        ssc->regs = devm_ioremap_resource(&pdev->dev, regs);
+        if (IS_ERR(ssc->regs))
+                return PTR_ERR(ssc->regs);
 
         ssc->phybase = regs->start;
 
@@ -175,7 +173,7 @@ static int ssc_probe(struct platform_device *pdev)
 
         /* disable all interrupts */
         clk_enable(ssc->clk);
-        ssc_writel(ssc->regs, IDR, ~0UL);
+        ssc_writel(ssc->regs, IDR, -1);
         ssc_readl(ssc->regs, SR);
         clk_disable(ssc->clk);