diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-21 11:39:21 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-21 11:39:21 -0500 |
| commit | 4510dbe324876f2f2f3dc9931e97ec0e98f1ee26 (patch) | |
| tree | d42a8ff24b82e0c6b01756b3f2c33756fc30fc17 /drivers/thermal/armada_thermal.c | |
| parent | b296263398f08d21e68d5d7b2afc43228c208b71 (diff) | |
| parent | c7788792a5e7b0d5d7f96d0766b4cb6112d47d75 (diff) | |
| download | blackbird-op-linux-4510dbe324876f2f2f3dc9931e97ec0e98f1ee26.tar.gz blackbird-op-linux-4510dbe324876f2f2f3dc9931e97ec0e98f1ee26.zip | |
Merge tag 'v3.10-rc2' into asoc-ux500
Linux 3.10-rc2
Diffstat (limited to 'drivers/thermal/armada_thermal.c')
| -rw-r--r-- | drivers/thermal/armada_thermal.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c index 5b4d75fd7b49..54ffd64ca3f7 100644 --- a/drivers/thermal/armada_thermal.c +++ b/drivers/thermal/armada_thermal.c @@ -169,21 +169,11 @@ static int armada_thermal_probe(struct platform_device *pdev) return -ENOMEM; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) { - dev_err(&pdev->dev, "Failed to get platform resource\n"); - return -ENODEV; - } - priv->sensor = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(priv->sensor)) return PTR_ERR(priv->sensor); res = platform_get_resource(pdev, IORESOURCE_MEM, 1); - if (!res) { - dev_err(&pdev->dev, "Failed to get platform resource\n"); - return -ENODEV; - } - priv->control = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(priv->control)) return PTR_ERR(priv->control); |
