upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up resources properly if attach fails. Always reset ISA drives on

Browse source 
probe.
This commit is contained in:
Nate Lawson 2004-07-15 16:41:07 +00:00
parent a6e4d8c453
commit 0bdf1a5508
2 changed files with 31 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
sys/dev/fdc/fdc_isa.c
View file

@ -1,4 +1,4 @@
/*
/*-
* Copyright (c) 2004 M. Warner Losh.
* All rights reserved.
*
@ -61,7 +61,7 @@ fdctl_wr_isa(fdc_p fdc, u_int8_t v)
bus_space_write_1(fdc->ctlt, fdc->ctlh, 0, v);
}
static int
int
fdc_isa_alloc_resources(device_t dev, struct fdc_data *fdc)
{
int ispnp, nports;
@ -191,7 +191,6 @@ static int
fdc_isa_probe(device_t dev)
{
int error, ic_type;
int ispnp;
struct fdc_data *fdc;
fdc = device_get_softc(dev);
@ -202,8 +201,6 @@ fdc_isa_probe(device_t dev)
error = ISA_PNP_PROBE(device_get_parent(dev), dev, fdc_ids);
if (error == ENXIO)
return (ENXIO);
ispnp = (error == 0);
/* Attempt to allocate our resources for the duration of the probe */
error = fdc_isa_alloc_resources(dev, fdc);
@ -211,11 +208,9 @@ fdc_isa_probe(device_t dev)
goto out;
/* Check that the controller is working. */
if (!ispnp) {
error = fdc_initial_reset(fdc);
if (error)
goto out;
}
error = fdc_initial_reset(fdc);
if (error)
goto out;
/* Try to determine a more specific device type. */
if (fd_cmd(fdc, 1, NE7CMD_VERSION, 1, &ic_type) == 0) {
@ -266,8 +261,20 @@ fdc_isa_attach(device_t dev)
break;
}
}
fdc_isa_alloc_resources(dev, fdc);
return (fdc_attach(dev));
error = fdc_isa_alloc_resources(dev, fdc);
if (error)
goto out;
error = fdc_attach(dev);
if (error)
goto out;
error = fdc_hints_probe(dev);
if (error)
goto out;
out:
if (error)
fdc_release_resources(fdc);
return (error);
}
static device_method_t fdc_methods[] = {
@ -295,4 +302,3 @@ static driver_t fdc_driver = {
};
DRIVER_MODULE(fdc, isa, fdc_driver, fdc_devclass, 0, 0);
DRIVER_MODULE(fdc, acpi, fdc_driver, fdc_devclass, 0, 0);

14
sys/dev/fdc/fdc_pccard.c
View file

@ -99,6 +99,7 @@ fdc_pccard_probe(device_t dev)
static int
fdc_pccard_attach(device_t dev)
{
int error;
struct fdc_data *fdc;
return ENXIO;
@ -107,8 +108,17 @@ fdc_pccard_attach(device_t dev)
fdc->fdctl_wr = fdctl_wr_pcmcia;
fdc->flags = FDC_NODMA;
fdc->fdct = FDC_NE765;
fdc_pccard_alloc_resources(dev, fdc);
return (fdc_attach(dev));
error = fdc_pccard_alloc_resources(dev, fdc);
if (error)
goto out;
error = fdc_attach(dev);
if (error)
goto out;
out:
if (error)
fdc_release_resources(fdc);
return (error);
}
static device_method_t fdc_pccard_methods[] = {