diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2006-03-07 22:05:22 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2006-03-07 22:05:22 +0000 |
| commit | d5ed9e1fe2ebeb7a5b04c9e07c0b3773694869da (patch) | |
| tree | 66474c28ac18177fa35f75714db58c752f6f0bc6 /c/src/libchip/ide/ide_controller.c | |
| parent | 2006-03-07 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-d5ed9e1fe2ebeb7a5b04c9e07c0b3773694869da.tar.bz2 | |
2006-03-07 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
PR 853/filesystem
* libchip/ide/ata.c, libchip/ide/ide_controller.c: The ata driver
should be modified to support the new exception scheme and to use the
handle parameter.
Diffstat (limited to '')
| -rw-r--r-- | c/src/libchip/ide/ide_controller.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/c/src/libchip/ide/ide_controller.c b/c/src/libchip/ide/ide_controller.c index cfd567e6f4..31af233366 100644 --- a/c/src/libchip/ide/ide_controller.c +++ b/c/src/libchip/ide/ide_controller.c @@ -51,9 +51,10 @@ ide_controller_initialize(rtems_device_major_number major, { IDE_Controller_Table[minor].status = IDE_CTRL_NON_INITIALIZED; - if ((IDE_Controller_Table[minor].probe != NULL && - IDE_Controller_Table[minor].probe(minor)) || - IDE_Controller_Table[minor].fns->ctrl_probe(minor)) + if ((IDE_Controller_Table[minor].probe == NULL || + IDE_Controller_Table[minor].probe(minor)) && + (IDE_Controller_Table[minor].fns->ctrl_probe == NULL || + IDE_Controller_Table[minor].fns->ctrl_probe(minor))) { status = rtems_io_register_name(IDE_Controller_Table[minor].name, major, minor); |