svn commit: r208757 - stable/8/sys/dev/fdc

Jung-uk Kim jkim at FreeBSD.org
Wed Jun 2 21:00:18 UTC 2010


Author: jkim
Date: Wed Jun  2 21:00:18 2010
New Revision: 208757
URL: http://svn.freebsd.org/changeset/base/208757

Log:
  MFC:	r208650
  
  Fix a regression from r203544 (MFC of r200554), which broke fdc(4)
  attachment to acpi(4).
  
  Approved by:	re (kib)

Modified:
  stable/8/sys/dev/fdc/fdc_acpi.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)
  stable/8/sys/geom/sched/   (props changed)

Modified: stable/8/sys/dev/fdc/fdc_acpi.c
==============================================================================
--- stable/8/sys/dev/fdc/fdc_acpi.c	Wed Jun  2 20:35:56 2010	(r208756)
+++ stable/8/sys/dev/fdc/fdc_acpi.c	Wed Jun  2 21:00:18 2010	(r208757)
@@ -96,6 +96,7 @@ fdc_acpi_attach(device_t dev)
 {
 	struct fdc_data *sc;
 	ACPI_BUFFER buf;
+	ACPI_OBJECT *obj;
 	device_t bus;
 	int error;
 
@@ -131,7 +132,8 @@ fdc_acpi_attach(device_t dev)
 	}
 
 	/* Add fd child devices as specified. */
-	error = fdc_acpi_probe_children(bus, dev, buf.Pointer);
+	obj = buf.Pointer;
+	error = fdc_acpi_probe_children(bus, dev, obj->Buffer.Pointer);
 
 out:
 	if (buf.Pointer)


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