Commit 9f8edd2e authored by Stephen Hemminger's avatar Stephen Hemminger

[PATCH] hp100 pci probe problem

Jean discovered problem with my hp100 PCI changes.
This should fix the problem... The multi-bus probe logic error handling was
botched.

He validated it; so please apply
parent f992adf3
...@@ -3043,14 +3043,27 @@ static int __init hp100_module_init(void) ...@@ -3043,14 +3043,27 @@ static int __init hp100_module_init(void)
int err; int err;
err = hp100_isa_init(); err = hp100_isa_init();
if (err && err != -ENODEV)
goto out;
#ifdef CONFIG_EISA #ifdef CONFIG_EISA
err |= eisa_driver_register(&hp100_eisa_driver); err = eisa_driver_register(&hp100_eisa_driver);
if (err && err != -ENODEV)
goto out2;
#endif #endif
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
err |= pci_module_init(&hp100_pci_driver); err = pci_module_init(&hp100_pci_driver);
if (err && err != -ENODEV)
goto out3;
#endif #endif
out:
return err; return err;
out3:
#ifdef CONFIG_EISA
eisa_driver_unregister (&hp100_eisa_driver);
out2:
#endif
hp100_isa_cleanup();
goto out;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment