Date: Thu, 23 Mar 2017 10:22:06 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> 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 Message-ID: <201703231022.v2NAM6wG048124@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703231022.v2NAM6wG048124>