From owner-svn-src-stable@FreeBSD.ORG  Tue Jan 17 01:28:44 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2BDD3106566B;
	Tue, 17 Jan 2012 01:28:44 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 166CF8FC0A;
	Tue, 17 Jan 2012 01:28:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0H1Shmn061204;
	Tue, 17 Jan 2012 01:28:43 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0H1ShLg061202;
	Tue, 17 Jan 2012 01:28:43 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201201170128.q0H1ShLg061202@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Tue, 17 Jan 2012 01:28:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230253 - in stable: 8/sys/dev/tws 9/sys/dev/tws
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Jan 2012 01:28:44 -0000

Author: delphij
Date: Tue Jan 17 01:28:43 2012
New Revision: 230253
URL: http://svn.freebsd.org/changeset/base/230253

Log:
  MFC 229416 + 223200:
  
  Don't forget to release queue lock when allocation of memory failed.
  
  Submitted by:	Sascha Wildner <saw online de>
  Obtained from:	DragonFly

Modified:
  stable/8/sys/dev/tws/tws.c
Directory Properties:
  stable/8/sys/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/9/sys/dev/tws/tws.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/8/sys/dev/tws/tws.c
==============================================================================
--- stable/8/sys/dev/tws/tws.c	Tue Jan 17 01:25:53 2012	(r230252)
+++ stable/8/sys/dev/tws/tws.c	Tue Jan 17 01:28:43 2012	(r230253)
@@ -685,6 +685,7 @@ tws_init_reqs(struct tws_softc *sc, u_in
     {
         if (bus_dmamap_create(sc->data_tag, 0, &sc->reqs[i].dma_map)) {
             /* log a ENOMEM failure msg here */
+            mtx_unlock(&sc->q_lock);
             return(FAILURE);
         } 
         sc->reqs[i].cmd_pkt =  &cmd_buf[i];