diff options
author | Shaohua Li <shaohua.li@intel.com> | 2009-11-17 04:19:23 -0500 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2009-11-25 16:45:55 -0500 |
commit | 1991bdfaf5897b6fbfdc7dce81508f7cbc044768 (patch) | |
tree | 51a34d8cd4d722ebb392e33a8941af08144ed1f5 /drivers/gpu/drm/i915/intel_lvds.c | |
parent | 1b3c7a47f993bf9ab6c4c7cc3bbf5588052b58f4 (diff) |
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>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lvds.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_lvds.c | 1 |
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 95011dfe1758..ab48edde4c9f 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c | |||
@@ -1149,5 +1149,6 @@ failed: | |||
1149 | if (intel_output->ddc_bus) | 1149 | if (intel_output->ddc_bus) |
1150 | intel_i2c_destroy(intel_output->ddc_bus); | 1150 | intel_i2c_destroy(intel_output->ddc_bus); |
1151 | drm_connector_cleanup(connector); | 1151 | drm_connector_cleanup(connector); |
1152 | drm_encoder_cleanup(encoder); | ||
1152 | kfree(intel_output); | 1153 | kfree(intel_output); |
1153 | } | 1154 | } |