From owner-svn-src-head@FreeBSD.ORG  Tue Apr  7 19:44:07 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3D7821065670;
	Tue,  7 Apr 2009 19:44:07 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2B8798FC14;
	Tue,  7 Apr 2009 19:44:07 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n37Ji7Hv024128;
	Tue, 7 Apr 2009 19:44:07 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n37Ji70Q024127;
	Tue, 7 Apr 2009 19:44:07 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200904071944.n37Ji70Q024127@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Tue, 7 Apr 2009 19:44:07 +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: r190820 - head/sys/dev/ata
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Tue, 07 Apr 2009 19:44:07 -0000

Author: ed
Date: Tue Apr  7 19:44:06 2009
New Revision: 190820
URL: http://svn.freebsd.org/changeset/base/190820

Log:
  Improve clarity: if (a && (b ? b : c)) -> if (a && (b || c))
  
  Submitted by:	Christoph Mallon <christoph.mallon@gmx.de>

Modified:
  head/sys/dev/ata/ata-queue.c

Modified: head/sys/dev/ata/ata-queue.c
==============================================================================
--- head/sys/dev/ata/ata-queue.c	Tue Apr  7 19:35:41 2009	(r190819)
+++ head/sys/dev/ata/ata-queue.c	Tue Apr  7 19:44:06 2009	(r190820)
@@ -444,8 +444,7 @@ ata_completed(void *context, int dummy)
 	}
 
 	if (!request->result &&
-	     (request->u.atapi.sense.key & ATA_SENSE_KEY_MASK ?
-	     request->u.atapi.sense.key & ATA_SENSE_KEY_MASK : 
+	     (request->u.atapi.sense.key & ATA_SENSE_KEY_MASK ||
 	     request->error))
 	    request->result = EIO;
     }