diff options
author | jkim <jkim@FreeBSD.org> | 2010-05-30 03:45:41 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2010-05-30 03:45:41 +0000 |
commit | a0e458c094097a0a309089d53d418aa51eeeb5ee (patch) | |
tree | d5c91917de12d7559ddc906f4570bd83a59aa8c4 /sys/dev/fdc | |
parent | 4fcdf7caa6f2ed8e431b4fbd876afa5df3db6669 (diff) | |
download | FreeBSD-src-a0e458c094097a0a309089d53d418aa51eeeb5ee.zip FreeBSD-src-a0e458c094097a0a309089d53d418aa51eeeb5ee.tar.gz |
Fix a regression from r200554, which broke fdc(4) attachment to acpi(4).
I removed too many lines and a wrong pointer was accidentally passed down.
Tested by: Scott Allendorf (scott-allendorf at uiowa dot edu), kib
MFC after: 3 days
Diffstat (limited to 'sys/dev/fdc')
-rw-r--r-- | sys/dev/fdc/fdc_acpi.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/dev/fdc/fdc_acpi.c b/sys/dev/fdc/fdc_acpi.c index 97ec9cb..7769a57 100644 --- a/sys/dev/fdc/fdc_acpi.c +++ b/sys/dev/fdc/fdc_acpi.c @@ -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) |