d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only fall back to probing the floppy drives via hints if there is a failure

Browse Source 
in the actual _FDE parsing.  If the failure occurs earlier such as in
fdc_attach() then don't try to probe any drives.

MFC after:	3 days
Reviewed by:	njl
Tested by:	Christian Laursen xi at borderworlds dot dk
This commit is contained in:
John Baldwin 2004-09-29 19:08:34 +00:00
parent a8b4525f63
commit 30b490009b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=135938
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/fdc/fdc_acpi.c
View File

@ -130,7 +130,7 @@ fdc_acpi_attach(device_t dev)
bus = device_get_parent(dev);
if (ACPI_FAILURE(ACPI_EVALUATE_OBJECT(bus, dev, "_FDE", NULL, &buf))) {
error = ENXIO;
goto out;
goto out_hintsprobe;
}
/* Parse the output of _FDE in various ways. */
@ -154,7 +154,7 @@ fdc_acpi_attach(device_t dev)
device_printf(dev, "_FDE wrong length: %d\n",
obj->Buffer.Length);
error = ENXIO;
goto out;
goto out_hintsprobe;
}
break;
case ACPI_TYPE_PACKAGE:
@ -173,17 +173,21 @@ fdc_acpi_attach(device_t dev)
default:
device_printf(dev, "invalid _FDE type %d\n", obj->Type);
error = ENXIO;
goto out;
goto out_hintsprobe;
}
/* Add fd child devices as specified. */
error = fdc_acpi_probe_children(bus, dev, fde);
out:
/* If there was a problem, fall back to the hints-based probe. */
out_hintsprobe:
/*
* If there was a problem with the _FDE drive enumeration, fall
* back to the hints-based probe.
*/
if (error)
error = fdc_hints_probe(dev);
out:
if (buf.Pointer)
free(buf.Pointer, M_TEMP);
if (error != 0)