svn commit: r187356 - in stable/7/sys: . contrib/pf dev/acpica dev/ath/ath_hal dev/cxgb

[Mike Silbersack]

Author: silby
Date: Sat Jan 17 06:55:28 2009
New Revision: 187356
URL: http://svn.freebsd.org/changeset/base/187356

Log:
  Merge r186031 - quick change to r186026

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/acpica/acpi_smbat.c
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/dev/acpica/acpi_smbat.c
==============================================================================
--- stable/7/sys/dev/acpica/acpi_smbat.c	Sat Jan 17 06:53:57 2009	(r187355)
+++ stable/7/sys/dev/acpica/acpi_smbat.c	Sat Jan 17 06:55:28 2009	(r187356)
@@ -332,7 +332,7 @@ acpi_smbus_read_multi_1(struct acpi_smba
 
 		ptr[len] = val;
 		if (batt_sleep_ms)
-		    AcpiOsSleep(1);
+		    AcpiOsSleep(batt_sleep_ms);
 	}
 
 out: