aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/gma500/psb_intel_lvds.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/gpu/drm/gma500/psb_intel_lvds.c b/drivers/gpu/drm/gma500/psb_intel_lvds.c
index 69a96513752f..c83f5b5d1057 100644
--- a/drivers/gpu/drm/gma500/psb_intel_lvds.c
+++ b/drivers/gpu/drm/gma500/psb_intel_lvds.c
@@ -713,7 +713,6 @@ void psb_intel_lvds_init(struct drm_device *dev,
713 713
714 psb_intel_encoder = 714 psb_intel_encoder =
715 kzalloc(sizeof(struct psb_intel_encoder), GFP_KERNEL); 715 kzalloc(sizeof(struct psb_intel_encoder), GFP_KERNEL);
716
717 if (!psb_intel_encoder) { 716 if (!psb_intel_encoder) {
718 dev_err(dev->dev, "psb_intel_encoder allocation error\n"); 717 dev_err(dev->dev, "psb_intel_encoder allocation error\n");
719 return; 718 return;
@@ -721,10 +720,9 @@ void psb_intel_lvds_init(struct drm_device *dev,
721 720
722 psb_intel_connector = 721 psb_intel_connector =
723 kzalloc(sizeof(struct psb_intel_connector), GFP_KERNEL); 722 kzalloc(sizeof(struct psb_intel_connector), GFP_KERNEL);
724
725 if (!psb_intel_connector) { 723 if (!psb_intel_connector) {
726 kfree(psb_intel_encoder);
727 dev_err(dev->dev, "psb_intel_connector allocation error\n"); 724 dev_err(dev->dev, "psb_intel_connector allocation error\n");
725 goto failed_encoder;
728 } 726 }
729 727
730 lvds_priv = kzalloc(sizeof(struct psb_intel_lvds_priv), GFP_KERNEL); 728 lvds_priv = kzalloc(sizeof(struct psb_intel_lvds_priv), GFP_KERNEL);
@@ -862,7 +860,8 @@ failed_blc_i2c:
862 drm_encoder_cleanup(encoder); 860 drm_encoder_cleanup(encoder);
863 drm_connector_cleanup(connector); 861 drm_connector_cleanup(connector);
864failed_connector: 862failed_connector:
865 if (psb_intel_connector) 863 kfree(psb_intel_connector);
866 kfree(psb_intel_connector); 864failed_encoder:
865 kfree(psb_intel_encoder);
867} 866}
868 867