From owner-svn-src-all@freebsd.org  Wed May  4 07:33:59 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 60534B2C1DB;
 Wed,  4 May 2016 07:33:59 +0000 (UTC)
 (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 2CF211F79;
 Wed,  4 May 2016 07:33:59 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u447Xw8i080424;
 Wed, 4 May 2016 07:33:58 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u447XwAK080423;
 Wed, 4 May 2016 07:33:58 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201605040733.u447XwAK080423@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Wed, 4 May 2016 07:33:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r299056 - stable/10/sbin/camcontrol
X-SVN-Group: stable-10
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.22
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: Wed, 04 May 2016 07:33:59 -0000

Author: ngie
Date: Wed May  4 07:33:58 2016
New Revision: 299056
URL: https://svnweb.freebsd.org/changeset/base/299056

Log:
  MFC r298758:
  
  Remove logically impossible test in scsidoinquiry(..)
  
  It was already done 4 lines prior and the value of error didn't change
  
  CID: 1011236

Modified:
  stable/10/sbin/camcontrol/camcontrol.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sbin/camcontrol/camcontrol.c
==============================================================================
--- stable/10/sbin/camcontrol/camcontrol.c	Wed May  4 07:06:48 2016	(r299055)
+++ stable/10/sbin/camcontrol/camcontrol.c	Wed May  4 07:33:58 2016	(r299056)
@@ -814,9 +814,6 @@ scsidoinquiry(struct cam_device *device,
 	if (arglist & CAM_ARG_GET_SERIAL)
 		scsiserial(device, retry_count, timeout);
 
-	if (error != 0)
-		return(error);
-
 	if (arglist & CAM_ARG_GET_XFERRATE)
 		error = camxferrate(device);