svn commit: r350543 - stable/12/sys/cam/ata

Brooks Davis brooks at FreeBSD.org
Fri Aug 2 20:31:03 UTC 2019


Author: brooks
Date: Fri Aug  2 20:31:02 2019
New Revision: 350543
URL: https://svnweb.freebsd.org/changeset/base/350543

Log:
  MFC r350228:
  
  ata_xpt: Use the correct union member when accessing valid.
  
  In principle this should not matter as it's a union and they point to
  the same memory location but based on the code above we should be
  accessing .sata and not .ata.
  
  Submitted by:	arichardson
  Reviewed by:	scottl, imp
  Obtained from:	CheriBSD
  Sponsored by:	DARPA, AFRL
  Differential Revision:	https://reviews.freebsd.org/D21002

Modified:
  stable/12/sys/cam/ata/ata_xpt.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/cam/ata/ata_xpt.c
==============================================================================
--- stable/12/sys/cam/ata/ata_xpt.c	Fri Aug  2 20:24:04 2019	(r350542)
+++ stable/12/sys/cam/ata/ata_xpt.c	Fri Aug  2 20:31:02 2019	(r350543)
@@ -452,7 +452,7 @@ negotiate:
 			if (cts.xport_specific.ata.valid & CTS_ATA_VALID_MODE)
 				mode = cts.xport_specific.ata.mode;
 		} else {
-			if (cts.xport_specific.ata.valid & CTS_SATA_VALID_MODE)
+			if (cts.xport_specific.sata.valid & CTS_SATA_VALID_MODE)
 				mode = cts.xport_specific.sata.mode;
 		}
 		/* If SIM disagree - renegotiate. */


More information about the svn-src-all mailing list