diff options
| -rw-r--r-- | drivers/thermal/dove_thermal.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/drivers/thermal/dove_thermal.c b/drivers/thermal/dove_thermal.c index 7b0bfa0e7a9c..3078c403b42d 100644 --- a/drivers/thermal/dove_thermal.c +++ b/drivers/thermal/dove_thermal.c | |||
| @@ -143,22 +143,18 @@ static int dove_thermal_probe(struct platform_device *pdev) | |||
| 143 | if (!priv) | 143 | if (!priv) |
| 144 | return -ENOMEM; | 144 | return -ENOMEM; |
| 145 | 145 | ||
| 146 | priv->sensor = devm_request_and_ioremap(&pdev->dev, res); | 146 | priv->sensor = devm_ioremap_resource(&pdev->dev, res); |
| 147 | if (!priv->sensor) { | 147 | if (IS_ERR(priv->sensor)) |
| 148 | dev_err(&pdev->dev, "Failed to request_ioremap memory\n"); | 148 | return PTR_ERR(priv->sensor); |
| 149 | return -EADDRNOTAVAIL; | ||
| 150 | } | ||
| 151 | 149 | ||
| 152 | res = platform_get_resource(pdev, IORESOURCE_MEM, 1); | 150 | res = platform_get_resource(pdev, IORESOURCE_MEM, 1); |
| 153 | if (!res) { | 151 | if (!res) { |
| 154 | dev_err(&pdev->dev, "Failed to get platform resource\n"); | 152 | dev_err(&pdev->dev, "Failed to get platform resource\n"); |
| 155 | return -ENODEV; | 153 | return -ENODEV; |
| 156 | } | 154 | } |
| 157 | priv->control = devm_request_and_ioremap(&pdev->dev, res); | 155 | priv->control = devm_ioremap_resource(&pdev->dev, res); |
| 158 | if (!priv->control) { | 156 | if (IS_ERR(priv->control)) |
| 159 | dev_err(&pdev->dev, "Failed to request_ioremap memory\n"); | 157 | return PTR_ERR(priv->control); |
| 160 | return -EADDRNOTAVAIL; | ||
| 161 | } | ||
| 162 | 158 | ||
| 163 | ret = dove_init_sensor(priv); | 159 | ret = dove_init_sensor(priv); |
| 164 | if (ret) { | 160 | if (ret) { |
