From owner-svn-src-head@freebsd.org  Thu Apr 28 21:17:24 2016
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 86DB2B2017A;
 Thu, 28 Apr 2016 21:17:24 +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 571C51779;
 Thu, 28 Apr 2016 21:17:24 +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 u3SLHNHr085062;
 Thu, 28 Apr 2016 21:17:23 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3SLHNAw085061;
 Thu, 28 Apr 2016 21:17:23 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201604282117.u3SLHNAw085061@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: Thu, 28 Apr 2016 21:17:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r298758 - head/sbin/camcontrol
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.21
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Apr 2016 21:17:24 -0000

Author: ngie
Date: Thu Apr 28 21:17:23 2016
New Revision: 298758
URL: https://svnweb.freebsd.org/changeset/base/298758

Log:
  Remove logically impossible test in scsidoinquiry(..)
  
  It was already done 4 lines prior and the value of error didn't change
  
  MFC after: 3 days
  Reported by: Coverity
  CID: 1011236
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/sbin/camcontrol/camcontrol.c

Modified: head/sbin/camcontrol/camcontrol.c
==============================================================================
--- head/sbin/camcontrol/camcontrol.c	Thu Apr 28 20:30:49 2016	(r298757)
+++ head/sbin/camcontrol/camcontrol.c	Thu Apr 28 21:17:23 2016	(r298758)
@@ -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);