From 4628d7f0c81f7bb0e6391129ab903e855c665bd1 Mon Sep 17 00:00:00 2001 From: Sachin Kamat Date: Mon, 4 Mar 2013 06:45:34 +0000 Subject: [PATCH] --- yaml --- r: 361577 b: refs/heads/master c: aa3b5d222da5922ab1883eba3e9d8f92ad148155 h: refs/heads/master i: 361575: 3d49f2d74278325ec23881981fa8f011850d0a5a v: v3 --- [refs] | 2 +- trunk/drivers/thermal/kirkwood_thermal.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index b4dba00dc21c..99bb6888e093 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5095526faf38472bf04af919797a1f01a0ccb558 +refs/heads/master: aa3b5d222da5922ab1883eba3e9d8f92ad148155 diff --git a/trunk/drivers/thermal/kirkwood_thermal.c b/trunk/drivers/thermal/kirkwood_thermal.c index 65cb4f09e8f6..e5500edb5285 100644 --- a/trunk/drivers/thermal/kirkwood_thermal.c +++ b/trunk/drivers/thermal/kirkwood_thermal.c @@ -85,11 +85,9 @@ static int kirkwood_thermal_probe(struct platform_device *pdev) if (!priv) return -ENOMEM; - priv->sensor = devm_request_and_ioremap(&pdev->dev, res); - if (!priv->sensor) { - dev_err(&pdev->dev, "Failed to request_ioremap memory\n"); - return -EADDRNOTAVAIL; - } + priv->sensor = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(priv->sensor)) + return PTR_ERR(priv->sensor); thermal = thermal_zone_device_register("kirkwood_thermal", 0, 0, priv, &ops, NULL, 0, 0);