--3e5zPOSaQk/kV0Ke
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Fri, May 28, 2010 at 07:07:04PM -0400, Jung-uk Kim wrote:
> 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:
> > >>
> > >> =20
> > >> http://svn.freebsd.org/viewvc/base?view=3Drevision&revision=3D203544
> > >
> > > 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.
>=20
> Please try the attached patch. Sorry, it was stupid. :-(
>=20
> Jung-uk Kim
> --- 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;
> =20
> @@ -131,7 +132,8 @@ fdc_acpi_attach(device_t dev)
> }
> =20
> /* Add fd child devices as specified. */
> - error =3D fdc_acpi_probe_children(bus, dev, buf.Pointer);
> + obj =3D buf.Pointer;
> + error =3D fdc_acpi_probe_children(bus, dev, obj->Buffer.Pointer);
> =20
> out:
> if (buf.Pointer)
Works for me as well.
--3e5zPOSaQk/kV0Ke
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (FreeBSD)
iEYEARECAAYFAkwBdFsACgkQC3+MBN1Mb4iNkgCgyk+dp6292z7xKSm/FPuzisMX
szAAoJ/bCkblOYOR9OPpG8ea4T4QSd21
=vkaS
-----END PGP SIGNATURE-----
--3e5zPOSaQk/kV0Ke--