diff options
| author | imp <imp@FreeBSD.org> | 2004-08-31 20:37:10 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2004-08-31 20:37:10 +0000 |
| commit | c4c3664bf7184430fffaf30bc032fc6db454f413 (patch) | |
| tree | e500209fa0c9dd6fb1a9d25366948bb140bacc8d /sys/dev/fdc/fdc_isa.c | |
| parent | d50f90b58c3694f031640d4b1c02bd2e1e610dbd (diff) | |
| download | FreeBSD-src-c4c3664bf7184430fffaf30bc032fc6db454f413.zip FreeBSD-src-c4c3664bf7184430fffaf30bc032fc6db454f413.tar.gz | |
When ISA_PNP_PROBE is called, it will return 0 when it finds a device,
ENOENT when there's no PNP ID for this device node, or ENXIO when there
is one, but it doesn't match.
In the nonPNP case (as most Alpha systems appear to be), we were
treating the error return as an error, when it should be have ignored
it. Version 1.9 properly ignored it, but the attach re-write of 1.10
introduced this logic error.
Pointy Hat to: phk (for breaking it then asking me to fix it :-)
Sponsored by: The Voices in Bill Paul's Head, LLC
Diffstat (limited to 'sys/dev/fdc/fdc_isa.c')
| -rw-r--r-- | sys/dev/fdc/fdc_isa.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/dev/fdc/fdc_isa.c b/sys/dev/fdc/fdc_isa.c index 4ca67b2..90b47e4 100644 --- a/sys/dev/fdc/fdc_isa.c +++ b/sys/dev/fdc/fdc_isa.c @@ -211,8 +211,7 @@ fdc_isa_attach(device_t dev) if (error == 0) fdc->flags |= FDC_ISPNP; - if (error == 0) - error = fdc_isa_alloc_resources(dev, fdc); + error = fdc_isa_alloc_resources(dev, fdc); if (error == 0) error = fdc_attach(dev); if (error == 0) |
