From owner-svn-src-stable-9@FreeBSD.ORG  Wed Feb 15 14:30:04 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D79C8106567A;
	Wed, 15 Feb 2012 14:30:04 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BBCBC8FC19;
	Wed, 15 Feb 2012 14:30:04 +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 q1FEU43F066079;
	Wed, 15 Feb 2012 14:30:04 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1FEU4D0066077;
	Wed, 15 Feb 2012 14:30:04 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201202151430.q1FEU4D0066077@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Wed, 15 Feb 2012 14:30:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r231762 - stable/9/sys/dev/sound/pcm
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Feb 2012 14:30:05 -0000

Author: mav
Date: Wed Feb 15 14:30:04 2012
New Revision: 231762
URL: http://svn.freebsd.org/changeset/base/231762

Log:
  MFC r231647:
  Do not handle MOD_SHUTDOWN equally to MOD_UNLOAD in sound kernel module.
  MOD_SHUTDOWN is not an end of existence, and there is a life after it.
  In particular, code previously called on MOD_SHUTDOWN grabbed lock and
  deallocated unit numbering. That caused infinite wait loop if snd_uaudio
  tried to destroy its PCM device after that point.

Modified:
  stable/9/sys/dev/sound/pcm/sound.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/dev/sound/pcm/sound.c
==============================================================================
--- stable/9/sys/dev/sound/pcm/sound.c	Wed Feb 15 14:29:23 2012	(r231761)
+++ stable/9/sys/dev/sound/pcm/sound.c	Wed Feb 15 14:30:04 2012	(r231762)
@@ -1415,7 +1415,6 @@ sound_modevent(module_t mod, int type, v
 			pcmsg_unrhdr = new_unrhdr(1, INT_MAX, NULL);
 			break;
 		case MOD_UNLOAD:
-		case MOD_SHUTDOWN:
 			ret = sndstat_acquire(curthread);
 			if (ret != 0)
 				break;
@@ -1424,6 +1423,8 @@ sound_modevent(module_t mod, int type, v
 				pcmsg_unrhdr = NULL;
 			}
 			break;
+		case MOD_SHUTDOWN:
+			break;
 		default:
 			ret = ENOTSUP;
 	}