From owner-svn-src-head@freebsd.org  Sun Jul 19 18:07:36 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D1E6B9A66D8;
 Sun, 19 Jul 2015 18:07:36 +0000 (UTC)
 (envelope-from markm@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C28DE1E43;
 Sun, 19 Jul 2015 18:07:36 +0000 (UTC)
 (envelope-from markm@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6JI7a1O096068;
 Sun, 19 Jul 2015 18:07:36 GMT (envelope-from markm@FreeBSD.org)
Received: (from markm@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6JI7a3e096067;
 Sun, 19 Jul 2015 18:07:36 GMT (envelope-from markm@FreeBSD.org)
Message-Id: <201507191807.t6JI7a3e096067@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markm set sender to
 markm@FreeBSD.org using -f
From: Mark Murray <markm@FreeBSD.org>
Date: Sun, 19 Jul 2015 18:07:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r285700 - head/sys/dev/random
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Jul 2015 18:07:36 -0000

Author: markm
Date: Sun Jul 19 18:07:35 2015
New Revision: 285700
URL: https://svnweb.freebsd.org/changeset/base/285700

Log:
  Fix some untidy logic. I committed the wrong local fix; please pass the pointy hat.
  
  Approved by:        so (/dev/random blanket)

Modified:
  head/sys/dev/random/randomdev.c

Modified: head/sys/dev/random/randomdev.c
==============================================================================
--- head/sys/dev/random/randomdev.c	Sun Jul 19 18:07:25 2015	(r285699)
+++ head/sys/dev/random/randomdev.c	Sun Jul 19 18:07:35 2015	(r285700)
@@ -183,7 +183,7 @@ read_random_uio(struct uio *uio, bool no
 			printf("random: %s unblock wait\n", __func__);
 		spamcount = (spamcount + 1)%100;
 		error = tsleep(&random_alg_context, PCATCH, "randseed", hz/10);
-		if ((error == ERESTART | error == EINTR))
+		if (error == ERESTART || error == EINTR)
 			break;
 	}
 	if (error == 0) {