Merge branch 'v3.16-next/cleanup-samsung' into v3.16-next/platform-exynos

1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index cb058408c70e..0eead16aeda7 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -1065,6 +1065,11 @@ int intel_panel_setup_backlight(struct drm_connector *connector)
         unsigned long flags;
         int ret;
 
+        if (!dev_priv->vbt.backlight.present) {
+                DRM_DEBUG_KMS("native backlight control not available per VBT\n");
+                return 0;
+        }
+
         /* set level and max in panel struct */
         spin_lock_irqsave(&dev_priv->backlight_lock, flags);
         ret = dev_priv->display.setup_backlight(intel_connector);