Date: Sun, 30 May 2010 03:45:41 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r208650 - head/sys/dev/fdc Message-ID: <201005300345.o4U3jfBU027317@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Sun May 30 03:45:41 2010 New Revision: 208650 URL: http://svn.freebsd.org/changeset/base/208650 Log: 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 Modified: head/sys/dev/fdc/fdc_acpi.c Modified: head/sys/dev/fdc/fdc_acpi.c ============================================================================== --- head/sys/dev/fdc/fdc_acpi.c Sat May 29 22:55:59 2010 (r208649) +++ head/sys/dev/fdc/fdc_acpi.c Sun May 30 03:45:41 2010 (r208650) @@ -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005300345.o4U3jfBU027317>