CVS commit: [jdolecek-ncq] src/sys/dev/ata

[Jaromir Dolecek]

Module Name:    src
Committed By:   jdolecek
Date:           Sat Jun 24 14:57:17 UTC 2017

Modified Files:
        src/sys/dev/ata [jdolecek-ncq]: ata.c

Log Message:
change ata_delay() to tsleep for 1 hz rather than indefinitely if
provided ms is lower than 1 hz


To generate a diff of this commit:
cvs rdiff -u -r1.132.8.16 -r1.132.8.17 src/sys/dev/ata/ata.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/ata/ata.c
diff -u src/sys/dev/ata/ata.c:1.132.8.16 src/sys/dev/ata/ata.c:1.132.8.17
--- src/sys/dev/ata/ata.c:1.132.8.16	Fri Jun 23 20:40:51 2017
+++ src/sys/dev/ata/ata.c	Sat Jun 24 14:57:17 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ata.c,v 1.132.8.16 2017/06/23 20:40:51 jdolecek Exp $	*/
+/*	$NetBSD: ata.c,v 1.132.8.17 2017/06/24 14:57:17 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.132.8.16 2017/06/23 20:40:51 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.132.8.17 2017/06/24 14:57:17 jdolecek Exp $");
 
 #include "opt_ata.h"
 
@@ -2110,7 +2110,8 @@ ata_delay(int ms, const char *msg, int f
 		 */
 		delay(ms * 1000);
 	} else {
-		kpause(msg, false, mstohz(ms), NULL);
+		int pause = mstohz(ms);
+		kpause(msg, false, pause > 0 ? pause : 1, NULL);
 	}
 }