summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShaohua Li <shaohua.li@intel.com>2009-11-17 17:19:23 +0800
committerEric Anholt <eric@anholt.net>2009-11-25 13:45:55 -0800
commit1991bdfaf5897b6fbfdc7dce81508f7cbc044768 (patch)
tree51a34d8cd4d722ebb392e33a8941af08144ed1f5
parent1b3c7a47f993bf9ab6c4c7cc3bbf5588052b58f4 (diff)
downloadkernel-crypto-1991bdfaf5897b6fbfdc7dce81508f7cbc044768.tar.gz
kernel-crypto-1991bdfaf5897b6fbfdc7dce81508f7cbc044768.tar.xz
kernel-crypto-1991bdfaf5897b6fbfdc7dce81508f7cbc044768.zip
drm/i915: handle failure path correctly for lvds
In failure path, make sure encoder is cleaned up, otherwise there is a kernel oops. Signed-off-by: Shaohua Li <shaohua.li@intel.com> Signed-off-by: Eric Anholt <eric@anholt.net>
-rw-r--r--drivers/gpu/drm/i915/intel_lvds.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 95011dfe175..ab48edde4c9 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -1149,5 +1149,6 @@ failed:
if (intel_output->ddc_bus)
intel_i2c_destroy(intel_output->ddc_bus);
drm_connector_cleanup(connector);
+ drm_encoder_cleanup(encoder);
kfree(intel_output);
}