Floppy drive not detected after 8.0-RELEASE->8.1-PRERELEASE

[Jung-uk Kim]

On Friday 28 May 2010 03:35 pm, Scott Allendorf wrote:
> Andriy Gapon wrote:
> > on 28/05/2010 19:32 Scott Allendorf said the following:
> >> I recently upgraded to 8.1-PRERELEASE (amd64) on a Dell Optiplex
> >> 960 running 8.0-RELEASE.  After the upgrade, my floppy drive was
> >> no longer detected.  After a binary search, the following commit
> >> appears to be responsible:
> >>
> >>   
> >> http://svn.freebsd.org/viewvc/base?view=revision&revision=203544
> >
> > Can you check if reverting of MFC of the following helps (it's a
> > part of that big ACPI MFC)?
> >
> > r200554 | jkim | 2009-12-15 00:28:32 +0200 (Tue, 15 Dec 2009) | 3
> > lines Remove _FDE quirk handling as these quirks are
> > automatically repaired by ACPICA layer since ACPICA 20091214.
>
> Thank you for your quick reply to my message.
>
> Reverting this change (src/sys/dev/fdc/fdc_acpi.c from 1.13.2.2 to
> 1.13.2.1) appears to have fixed the issue.  The floppy drive is now
> detected and it is functional.  There do not appear to be any side
> effects.

Please try the attached patch.  Sorry, it was stupid. :-(

Jung-uk Kim
-------------- next part --------------
--- sys/dev/fdc/fdc_acpi.c	(revision 208626)
+++ sys/dev/fdc/fdc_acpi.c	(working copy)
@@ -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)