From patchwork Wed Nov 17 06:24:53 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jeremy Kerr <jeremy.kerr@canonical.com>
X-Patchwork-Id: 331061
Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAH6PHmZ011918
	for <patchwork-intel-gfx@patchwork.kernel.org>;
	Wed, 17 Nov 2010 06:25:38 GMT
Received: from gabe.freedesktop.org (localhost [127.0.0.1])
	by gabe.freedesktop.org (Postfix) with ESMTP id DC04AA0D98
	for <patchwork-intel-gfx@patchwork.kernel.org>;
	Tue, 16 Nov 2010 22:25:16 -0800 (PST)
X-Original-To: intel-gfx@lists.freedesktop.org
Delivered-To: intel-gfx@lists.freedesktop.org
Received: from ozlabs.org (ozlabs.org [203.10.76.45])
	by gabe.freedesktop.org (Postfix) with ESMTP id 438549E763
	for <intel-gfx@lists.freedesktop.org>;
	Tue, 16 Nov 2010 22:24:58 -0800 (PST)
Received: by ozlabs.org (Postfix, from userid 1023)
	id 8E6E7B717F; Wed, 17 Nov 2010 17:24:57 +1100 (EST)
MIME-Version: 1.0
Message-Id: <1289975093.142900.349539985875.1.gpush@pororo>
To: <intel-gfx@lists.freedesktop.org>
From: Jeremy Kerr <jeremy.kerr@canonical.com>
Date: Wed, 17 Nov 2010 14:24:53 +0800
Subject: [Intel-gfx] [PATCH] drm/i915: don't use i915_driver_unload() to
	cleanup failed	vblank init
X-BeenThere: intel-gfx@lists.freedesktop.org
X-Mailman-Version: 2.1.11
Precedence: list
List-Id: Intel graphics driver community testing & development
	<intel-gfx.lists.freedesktop.org>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/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+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org
Errors-To: 
 intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Wed, 17 Nov 2010 06:25:38 +0000 (UTC)


diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 7a26f4d..80766b6 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -2043,8 +2043,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 	ret = drm_vblank_init(dev, I915_NUM_PIPE);
 
 	if (ret) {
-		(void) i915_driver_unload(dev);
-		return ret;
+		DRM_ERROR("failed to init vblank\n");
+		goto out_workqueue_free;
 	}
 
 	/* Start out suspended */