From patchwork Wed May 26 20:56:02 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Chris Wilson <chris@chris-wilson.co.uk>
X-Patchwork-Id: 102509
Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177])
	by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4QKuGCd029315
	for <patchwork-intel-gfx@patchwork.kernel.org>;
	Wed, 26 May 2010 20:56:51 GMT
Received: from gabe.freedesktop.org (localhost [127.0.0.1])
	by gabe.freedesktop.org (Postfix) with ESMTP id BDA389E923
	for <patchwork-intel-gfx@patchwork.kernel.org>;
	Wed, 26 May 2010 13:56:16 -0700 (PDT)
X-Original-To: intel-gfx@lists.freedesktop.org
Delivered-To: intel-gfx@lists.freedesktop.org
Received: from fmsmga102.fm.intel.com (mga10.intel.com [192.55.52.92])
	by gabe.freedesktop.org (Postfix) with ESMTP id E39029E773
	for <intel-gfx@lists.freedesktop.org>;
	Wed, 26 May 2010 13:56:06 -0700 (PDT)
Received: from fmsmga001.fm.intel.com ([10.253.24.23])
	by fmsmga102.fm.intel.com with ESMTP; 26 May 2010 13:53:20 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="4.53,306,1272870000"; d="scan'208";a="802167694"
Received: from unknown (HELO broadwater.ger.corp.intel.com) ([10.255.16.162])
	by fmsmga001.fm.intel.com with ESMTP; 26 May 2010 13:55:48 -0700
From: Chris Wilson <chris@chris-wilson.co.uk>
To: intel-gfx@lists.freedesktop.org
Date: Wed, 26 May 2010 21:56:02 +0100
Message-Id: <1274907362-9624-1-git-send-email-chris@chris-wilson.co.uk>
X-Mailer: git-send-email 1.7.1
Subject: [Intel-gfx] [PATCH] drm/i915: Return the error code from init_hws()
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>
MIME-Version: 1.0
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 (demeter.kernel.org [140.211.167.41]);
	Wed, 26 May 2010 20:56:51 +0000 (UTC)


diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index aacd798..e0e29ae 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -4640,7 +4640,7 @@ err_unpin:
 err_unref:
 	drm_gem_object_unreference(obj);
 err:
-	return 0;
+	return ret;
 }
 
 static void