svn commit: r360683 - stable/11/sys/dev/ata

Dimitry Andric dim at FreeBSD.org
Wed May 6 05:35:01 UTC 2020


Author: dim
Date: Wed May  6 05:35:00 2020
New Revision: 360683
URL: https://svnweb.freebsd.org/changeset/base/360683

Log:
  MFC r335896 (by sbruno):
  
  Reset indentiation of ata_suspend() such that its clear we fall through
  this function and that we aren't supposed to be controlled by the first
  if() conditional.  Found with gcc.
  
  No functional change is intended with this commit.

Modified:
  stable/11/sys/dev/ata/ata-all.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/ata/ata-all.c
==============================================================================
--- stable/11/sys/dev/ata/ata-all.c	Wed May  6 05:32:50 2020	(r360682)
+++ stable/11/sys/dev/ata/ata-all.c	Wed May  6 05:35:00 2020	(r360683)
@@ -314,13 +314,13 @@ ata_suspend(device_t dev)
     if (!dev || !(ch = device_get_softc(dev)))
 	return ENXIO;
 
-	if (ch->flags & ATA_PERIODIC_POLL)
-		callout_drain(&ch->poll_callout);
-	mtx_lock(&ch->state_mtx);
-	xpt_freeze_simq(ch->sim, 1);
-	while (ch->state != ATA_IDLE)
-		msleep(ch, &ch->state_mtx, PRIBIO, "atasusp", hz/100);
-	mtx_unlock(&ch->state_mtx);
+    if (ch->flags & ATA_PERIODIC_POLL)
+	callout_drain(&ch->poll_callout);
+    mtx_lock(&ch->state_mtx);
+    xpt_freeze_simq(ch->sim, 1);
+    while (ch->state != ATA_IDLE)
+	msleep(ch, &ch->state_mtx, PRIBIO, "atasusp", hz/100);
+    mtx_unlock(&ch->state_mtx);
     return(0);
 }
 


More information about the svn-src-all mailing list