From patchwork Tue Nov 17 09:19:23 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Shaohua Li <shaohua.li@intel.com>
X-Patchwork-Id: 60603
Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177])
	by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nAH9JleY028995
	for <patchwork-intel-gfx@patchwork.kernel.org>;
	Tue, 17 Nov 2009 09:19:47 GMT
Received: from gabe.freedesktop.org (localhost [127.0.0.1])
	by gabe.freedesktop.org (Postfix) with ESMTP id E79759EFF6;
	Tue, 17 Nov 2009 01:19:46 -0800 (PST)
X-Original-To: intel-gfx@lists.freedesktop.org
Delivered-To: intel-gfx@lists.freedesktop.org
Received: from mga09.intel.com (mga09.intel.com [134.134.136.24])
	by gabe.freedesktop.org (Postfix) with ESMTP id 957AF9EF78
	for <intel-gfx@lists.freedesktop.org>;
	Tue, 17 Nov 2009 01:19:43 -0800 (PST)
Received: from orsmga002.jf.intel.com ([10.7.209.21])
	by orsmga102.jf.intel.com with ESMTP; 17 Nov 2009 01:04:59 -0800
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="4.44,757,1249282800"; d="scan'208";a="467988456"
Received: from sli10-conroe.sh.intel.com (HELO sli10-desk.sh.intel.com)
	([10.239.13.200])
	by orsmga002.jf.intel.com with ESMTP; 17 Nov 2009 01:36:32 -0800
Received: from david by sli10-desk.sh.intel.com with local (Exim 4.69)
	(envelope-from <shaohua.li@intel.com>)
	id 1NAKDc-0005lb-1q; Tue, 17 Nov 2009 17:19:24 +0800
Date: Tue, 17 Nov 2009 17:19:23 +0800
From: Shaohua Li <shaohua.li@intel.com>
To: intel-gfx@lists.freedesktop.org
Message-ID: <20091117091923.GA21338@sli10-desk.sh.intel.com>
MIME-Version: 1.0
Content-Disposition: inline
User-Agent: Mutt/1.5.20 (2009-06-14)
Subject: [Intel-gfx] [PATCH]drm/i915: handle failure path correctly for lvds
X-BeenThere: intel-gfx@lists.freedesktop.org
X-Mailman-Version: 2.1.9
Precedence: list
List-Id: Intel graphics driver community testing & development
	<intel-gfx.lists.freedesktop.org>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Sender: intel-gfx-bounces@lists.freedesktop.org
Errors-To: intel-gfx-bounces@lists.freedesktop.org


diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 05598ae..b272eb7 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -1093,5 +1093,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);
 }