From owner-svn-src-stable@freebsd.org Thu Mar 23 10:22:08 2017 Return-Path: Delivered-To: svn-src-stable@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 12D65D19A0C; Thu, 23 Mar 2017 10:22:08 +0000 (UTC) (envelope-from avg@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 D63A7100C; Thu, 23 Mar 2017 10:22:07 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2NAM61M048125; Thu, 23 Mar 2017 10:22:06 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2NAM6wG048124; Thu, 23 Mar 2017 10:22:06 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201703231022.v2NAM6wG048124@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Thu, 23 Mar 2017 10:22:06 +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: r315854 - stable/10/sys/dev/aacraid X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Mar 2017 10:22:08 -0000 Author: avg Date: Thu Mar 23 10:22:06 2017 New Revision: 315854 URL: https://svnweb.freebsd.org/changeset/base/315854 Log: revert r315841, MFC of r315083: not applicable to this branch And it broke the build too. Reported by: lwhsu Modified: stable/10/sys/dev/aacraid/aacraid_cam.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/aacraid/aacraid_cam.c ============================================================================== --- stable/10/sys/dev/aacraid/aacraid_cam.c Thu Mar 23 09:13:21 2017 (r315853) +++ stable/10/sys/dev/aacraid/aacraid_cam.c Thu Mar 23 10:22:06 2017 (r315854) @@ -244,7 +244,6 @@ aac_cam_probe(device_t dev) { struct aac_softc *sc; struct aac_cam *camsc; - struct aac_softc *sc; camsc = (struct aac_cam *)device_get_softc(dev); if (!camsc->inf) @@ -1138,7 +1137,6 @@ aac_container_complete(struct aac_comman { struct aac_softc *sc; union ccb *ccb; - struct aac_softc *sc; u_int32_t status; sc = cm->cm_sc; @@ -1148,7 +1146,7 @@ aac_container_complete(struct aac_comman if (cm->cm_flags & AAC_CMD_RESET) { ccb->ccb_h.status = CAM_SCSI_BUS_RESET; - } else if (status == ST_OK) { + } else if (status == ST_OK) { ccb->ccb_h.status = CAM_REQ_CMP; } else if (status == ST_NOT_READY) { ccb->ccb_h.status = CAM_BUSY;