From owner-svn-src-all@FreeBSD.ORG  Mon Jan 16 00:26:53 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4A29D1065672;
	Mon, 16 Jan 2012 00:26:53 +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 34B688FC1B;
	Mon, 16 Jan 2012 00:26:53 +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 q0G0Qr1r007420;
	Mon, 16 Jan 2012 00:26:53 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0G0QrnK007418;
	Mon, 16 Jan 2012 00:26:53 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201201160026.q0G0QrnK007418@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 16 Jan 2012 00:26:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230181 - head/sys/dev/sound/pci/hda
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Jan 2012 00:26:53 -0000

Author: mav
Date: Mon Jan 16 00:26:52 2012
New Revision: 230181
URL: http://svn.freebsd.org/changeset/base/230181

Log:
  Add check to avoid assertion panic on duplicate stop.
  
  Reported by:	Yuri Pankov <yuri.pankov@gmail.com>
  MFC after:	2 months

Modified:
  head/sys/dev/sound/pci/hda/hdaa.c

Modified: head/sys/dev/sound/pci/hda/hdaa.c
==============================================================================
--- head/sys/dev/sound/pci/hda/hdaa.c	Mon Jan 16 00:26:49 2012	(r230180)
+++ head/sys/dev/sound/pci/hda/hdaa.c	Mon Jan 16 00:26:52 2012	(r230181)
@@ -1351,6 +1351,8 @@ hdaa_channel_stop(struct hdaa_chan *ch)
 	struct hdaa_widget *w;
 	int i;
 
+	if ((ch->flags & HDAA_CHN_RUNNING) == 0)
+		return;
 	ch->flags &= ~HDAA_CHN_RUNNING;
 	HDAC_STREAM_STOP(device_get_parent(devinfo->dev), devinfo->dev,
 	    ch->dir == PCMDIR_PLAY ? 1 : 0, ch->sid);