These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / gpu / drm / tilcdc / tilcdc_panel.c

diff --git a/kernel/drivers/gpu/drm/tilcdc/tilcdc_panel.c b/kernel/drivers/gpu/drm/tilcdc/tilcdc_panel.c
index 7a03158..0af8bed 100644 (file)
--- a/kernel/drivers/gpu/drm/tilcdc/tilcdc_panel.c
+++ b/kernel/drivers/gpu/drm/tilcdc/tilcdc_panel.c
@@ -375,25 +375,17 @@ static int panel_probe(struct platform_device *pdev)
                dev_info(&pdev->dev, "found backlight\n");
        }
 
-       panel_mod->enable_gpio = devm_gpiod_get(&pdev->dev, "enable");
+       panel_mod->enable_gpio = devm_gpiod_get_optional(&pdev->dev, "enable",
+                                                        GPIOD_OUT_LOW);
        if (IS_ERR(panel_mod->enable_gpio)) {
                ret = PTR_ERR(panel_mod->enable_gpio);
-               if (ret != -ENOENT) {
-                       dev_err(&pdev->dev, "failed to request enable GPIO\n");
-                       goto fail_backlight;
-               }
-
-               /* Optional GPIO is not here, continue silently. */
-               panel_mod->enable_gpio = NULL;
-       } else {
-               ret = gpiod_direction_output(panel_mod->enable_gpio, 0);
-               if (ret < 0) {
-                       dev_err(&pdev->dev, "failed to setup GPIO\n");
-                       goto fail_backlight;
-               }
-               dev_info(&pdev->dev, "found enable GPIO\n");
+               dev_err(&pdev->dev, "failed to request enable GPIO\n");
+               goto fail_backlight;
        }
 
+       if (panel_mod->enable_gpio)
+               dev_info(&pdev->dev, "found enable GPIO\n");
+
        mod = &panel_mod->base;
        pdev->dev.platform_data = mod;