From owner-svn-src-all@freebsd.org  Sun Sep  8 20:42:28 2019
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id D6124E153C;
 Sun,  8 Sep 2019 20:42:28 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 46RNX44Mljz44yY;
 Sun,  8 Sep 2019 20:42:28 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7A3CA2AED;
 Sun,  8 Sep 2019 20:42:28 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x88KgSLj040162;
 Sun, 8 Sep 2019 20:42:28 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x88KgS5F040161;
 Sun, 8 Sep 2019 20:42:28 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201909082042.x88KgS5F040161@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Sun, 8 Sep 2019 20:42:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject: svn commit: r352044 - stable/12/sys/dev/sound/midi
X-SVN-Group: stable-12
X-SVN-Commit-Author: markj
X-SVN-Commit-Paths: stable/12/sys/dev/sound/midi
X-SVN-Commit-Revision: 352044
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.29
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: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Sep 2019 20:42:28 -0000

Author: markj
Date: Sun Sep  8 20:42:28 2019
New Revision: 352044
URL: https://svnweb.freebsd.org/changeset/base/352044

Log:
  MFC r351624:
  Properly check for an interrupted cv_wait_sig().

Modified:
  stable/12/sys/dev/sound/midi/sequencer.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/sound/midi/sequencer.c
==============================================================================
--- stable/12/sys/dev/sound/midi/sequencer.c	Sun Sep  8 20:42:01 2019	(r352043)
+++ stable/12/sys/dev/sound/midi/sequencer.c	Sun Sep  8 20:42:28 2019	(r352044)
@@ -912,7 +912,7 @@ mseq_read(struct cdev *i_dev, struct uio *uio, int iof
 				goto err1;
 
 			retval = cv_wait_sig(&scp->in_cv, &scp->seq_lock);
-			if (retval == EINTR)
+			if (retval != 0)
 				goto err1;
 		}
 
@@ -977,7 +977,7 @@ mseq_write(struct cdev *i_dev, struct uio *uio, int io
 		         * We slept, maybe things have changed since last
 		         * dying check
 		         */
-			if (retval == EINTR)
+			if (retval != 0)
 				goto err0;
 #if 0
 			/*