From a94c9ce3c35fbe2e037e8142c412d9332bc8d1ae Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 23 Sep 2010 16:15:21 +0100 Subject: [PATCH] --- yaml --- r: 211035 b: refs/heads/master c: 123d5c0197d8333c3f5cb9572a0c8299dc611233 h: refs/heads/master i: 211033: 186817278fca5a4b59acf909107a58101f7b47dc 211031: c4e383085144ba387ab8682d0e0bd9c17b9db81a v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_sdvo.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ded4005039c8..3ea68fe8f8c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b74f7348f214b1f99819f0d0da4a1cbabb1e740 +refs/heads/master: 123d5c0197d8333c3f5cb9572a0c8299dc611233 diff --git a/trunk/drivers/gpu/drm/i915/intel_sdvo.c b/trunk/drivers/gpu/drm/i915/intel_sdvo.c index e8e902d614ed..60fcef700be6 100644 --- a/trunk/drivers/gpu/drm/i915/intel_sdvo.c +++ b/trunk/drivers/gpu/drm/i915/intel_sdvo.c @@ -2170,8 +2170,7 @@ intel_sdvo_tv_init(struct intel_sdvo *intel_sdvo, int type) return true; err: - intel_sdvo_destroy_enhance_property(connector); - kfree(intel_sdvo_connector); + intel_sdvo_destroy(connector); return false; } @@ -2243,8 +2242,7 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device) return true; err: - intel_sdvo_destroy_enhance_property(connector); - kfree(intel_sdvo_connector); + intel_sdvo_destroy(connector); return false; }