Module Name: src
Committed By: macallan
Date: Thu Apr 1 05:26:48 UTC 2010
Modified Files:
src/sys/dev/i2c: dbcool.c
Log Message:
don't divide by zero. ever.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/i2c/dbcool.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/i2c/dbcool.c
diff -u src/sys/dev/i2c/dbcool.c:1.22 src/sys/dev/i2c/dbcool.c:1.23
--- src/sys/dev/i2c/dbcool.c:1.22 Thu Apr 1 04:29:35 2010
+++ src/sys/dev/i2c/dbcool.c Thu Apr 1 05:26:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dbcool.c,v 1.22 2010/04/01 04:29:35 macallan Exp $ */
+/* $NetBSD: dbcool.c,v 1.23 2010/04/01 05:26:48 macallan Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.22 2010/04/01 04:29:35 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.23 2010/04/01 05:26:48 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -922,7 +922,8 @@
if (rpm == 0xffff)
return 0; /* 0xffff indicates stalled/failed fan */
- return (sc->sc_dc.dc_chip->rpm_dividend / rpm);
+ /* don't divide by zero */
+ return (rpm == 0)? 0 : (sc->sc_dc.dc_chip->rpm_dividend / rpm);
}
/* Provide chip's supply voltage, in microvolts */
