svn commit: r202792 - stable/8/sys/dev/acpica

Andriy Gapon avg at FreeBSD.org
Fri Jan 22 09:41:09 UTC 2010


Author: avg
Date: Fri Jan 22 09:41:09 2010
New Revision: 202792
URL: http://svn.freebsd.org/changeset/base/202792

Log:
  MFC r202567: acpi_ec: remove redundant acpi_disabled check

Modified:
  stable/8/sys/dev/acpica/acpi_ec.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/acpica/acpi_ec.c
==============================================================================
--- stable/8/sys/dev/acpica/acpi_ec.c	Fri Jan 22 09:37:47 2010	(r202791)
+++ stable/8/sys/dev/acpica/acpi_ec.c	Fri Jan 22 09:41:09 2010	(r202792)
@@ -366,8 +366,7 @@ acpi_ec_probe(device_t dev)
     if (params != NULL) {
 	ecdt = 1;
 	ret = 0;
-    } else if (!acpi_disabled("ec") &&
-	ACPI_ID_PROBE(device_get_parent(dev), dev, ec_ids)) {
+    } else if (ACPI_ID_PROBE(device_get_parent(dev), dev, ec_ids)) {
 	params = malloc(sizeof(struct acpi_ec_params), M_TEMP,
 			M_WAITOK | M_ZERO);
 	h = acpi_get_handle(dev);


More information about the svn-src-stable-8 mailing list