diff options
| author | nyan <nyan@FreeBSD.org> | 2004-07-17 10:07:19 +0000 |
|---|---|---|
| committer | nyan <nyan@FreeBSD.org> | 2004-07-17 10:07:19 +0000 |
| commit | bd381ddb1f5e0f5af96a187211575497fe16ffcb (patch) | |
| tree | e8affcb302cdb9740cb14b38d33beb0cb2b2ad59 /sys/pc98/cbus/fdc_cbus.c | |
| parent | 2527e9825572f543c4024b5bb50f7a8abaa1d37f (diff) | |
| download | FreeBSD-src-bd381ddb1f5e0f5af96a187211575497fe16ffcb.zip FreeBSD-src-bd381ddb1f5e0f5af96a187211575497fe16ffcb.tar.gz | |
Merged from the following changes.
- sys/dev/fdc/fdc.c revision 1.281
- sys/dev/fdc/fdcvar.h revision 1.3
- sys/dev/fdc/fdc_isa.c revision 1.7
Diffstat (limited to 'sys/pc98/cbus/fdc_cbus.c')
| -rw-r--r-- | sys/pc98/cbus/fdc_cbus.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/pc98/cbus/fdc_cbus.c b/sys/pc98/cbus/fdc_cbus.c index e0634a0..0980e00 100644 --- a/sys/pc98/cbus/fdc_cbus.c +++ b/sys/pc98/cbus/fdc_cbus.c @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 2004 Yoshihiro TAKAHASHI * All rights reserved. * @@ -132,13 +132,14 @@ fdc_cbus_probe(device_t dev) static int fdc_cbus_attach(device_t dev) { - int error; struct fdc_data *fdc; + int error; fdc = device_get_softc(dev); if ((error = fdc_cbus_alloc_resources(dev, fdc)) != 0 || - (error = fdc_attach(dev)) != 0) { + (error = fdc_attach(dev)) != 0 || + (error = fdc_hints_probe(dev)) != 0) { fdc_release_resources(fdc); return (error); } |
