From patchwork Mon May 17 13:23:52 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel J Blueman X-Patchwork-Id: 100134 Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4HF8SPF007311 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 17 May 2010 15:09:04 GMT Received: from localhost ([127.0.0.1] helo=sfs-ml-1.v29.ch3.sourceforge.com) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1OE1tY-0005Hr-HK; Mon, 17 May 2010 15:06:16 +0000 Received: from sfi-mx-4.v28.ch3.sourceforge.com ([172.29.28.124] helo=mx.sourceforge.net) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1OE0IZ-0002xd-3G for dri-devel@lists.sourceforge.net; Mon, 17 May 2010 13:23:59 +0000 Received-SPF: pass (sfi-mx-4.v28.ch3.sourceforge.com: domain of gmail.com designates 209.85.160.174 as permitted sender) client-ip=209.85.160.174; envelope-from=daniel.blueman@gmail.com; helo=mail-gy0-f174.google.com; Received: from mail-gy0-f174.google.com ([209.85.160.174]) by sfi-mx-4.v28.ch3.sourceforge.com with esmtp (Exim 4.69) id 1OE0IY-0004gC-9Y for dri-devel@lists.sourceforge.net; Mon, 17 May 2010 13:23:59 +0000 Received: by gyg13 with SMTP id 13so2275249gyg.5 for ; Mon, 17 May 2010 06:23:52 -0700 (PDT) MIME-Version: 1.0 Received: by 10.91.41.19 with SMTP id t19mr2038132agj.3.1274102632474; Mon, 17 May 2010 06:23:52 -0700 (PDT) Received: by 10.90.84.2 with HTTP; Mon, 17 May 2010 06:23:52 -0700 (PDT) Date: Mon, 17 May 2010 14:23:52 +0100 Message-ID: Subject: [2.6.34, patch] i915: fix lock imbalance on error path... From: Daniel J Blueman To: dri-devel@lists.sf.net, linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org X-Spam-Score: -1.5 (-) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record -0.0 DKIM_VERIFIED Domain Keys Identified Mail: signature passes verification 0.0 DKIM_SIGNED Domain Keys Identified Mail: message has a signature X-Headers-End: 1OE0IY-0004gC-9Y X-Mailman-Approved-At: Mon, 17 May 2010 15:06:14 +0000 Cc: Dave Airlie X-BeenThere: dri-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.sourceforge.net X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 17 May 2010 15:09:04 +0000 (UTC) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index cc03537..f5fee1b 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -341,6 +341,7 @@ int i965_reset(struct drm_device *dev, u8 flags) } } else { DRM_ERROR("Error occurred. Don't know how to reset this chip.\n"); + mutex_unlock(&dev->struct_mutex); return -ENODEV; }