Merge branch 'pipe-rework' (patches from David Howells)

[linux.git] / drivers / thermal / thermal-generic-adc.c

diff --git a/drivers/thermal/thermal-generic-adc.c b/drivers/thermal/thermal-generic-adc.c
index dcecf2e8dc8e8ac1981c99e878c8c9453b69c6c0..ae5743c9a894f400c33c98e50b422746ea6c54ed 100644 (file)
--- a/drivers/thermal/thermal-generic-adc.c
+++ b/drivers/thermal/thermal-generic-adc.c
@@ -134,7 +134,8 @@ static int gadc_thermal_probe(struct platform_device *pdev)
        gti->channel = devm_iio_channel_get(&pdev->dev, "sensor-channel");
        if (IS_ERR(gti->channel)) {
                ret = PTR_ERR(gti->channel);
-               dev_err(&pdev->dev, "IIO channel not found: %d\n", ret);
+               if (ret != -EPROBE_DEFER)
+                       dev_err(&pdev->dev, "IIO channel not found: %d\n", ret);
                return ret;
        }
 
@@ -142,8 +143,10 @@ static int gadc_thermal_probe(struct platform_device *pdev)
                                                           &gadc_thermal_ops);
        if (IS_ERR(gti->tz_dev)) {
                ret = PTR_ERR(gti->tz_dev);
-               dev_err(&pdev->dev, "Thermal zone sensor register failed: %d\n",
-                       ret);
+               if (ret != -EPROBE_DEFER)
+                       dev_err(&pdev->dev,
+                               "Thermal zone sensor register failed: %d\n",
+                               ret);
                return ret;
        }