diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2013-04-08 18:10:13 +0200 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-04-08 18:10:13 +0200 |
| commit | da821eb7d42935b0f7056d98c75fd1150f6636f4 (patch) | |
| tree | de83ac171d51bbe7621110c3145a68c198b13711 /drivers/thermal/kirkwood_thermal.c | |
| parent | ARM: EXYNOS: fix compilation error introduced due to common clock migration (diff) | |
| parent | Linux 3.9-rc5 (diff) | |
| download | linux-da821eb7d42935b0f7056d98c75fd1150f6636f4.tar.xz linux-da821eb7d42935b0f7056d98c75fd1150f6636f4.zip | |
Merge commit 'v3.9-rc5' into next/clk-exynos
Conflicts:
arch/arm/boot/dts/exynos4.dtsi
arch/arm/boot/dts/exynos5440.dtsi
Diffstat (limited to 'drivers/thermal/kirkwood_thermal.c')
| -rw-r--r-- | drivers/thermal/kirkwood_thermal.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/thermal/kirkwood_thermal.c b/drivers/thermal/kirkwood_thermal.c index 65cb4f09e8f6..e5500edb5285 100644 --- a/drivers/thermal/kirkwood_thermal.c +++ b/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); |