diff options
| author | imp <imp@FreeBSD.org> | 2009-03-26 17:36:19 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2009-03-26 17:36:19 +0000 |
| commit | fbddcbbc7a27f2e614e2b78cc244e5582a3faa1e (patch) | |
| tree | 65e8ac447f171525452850b1826873b9b919dc30 | |
| parent | ac334eb30e7fc51d608733da4eef1ad1f9360aee (diff) | |
| download | FreeBSD-src-fbddcbbc7a27f2e614e2b78cc244e5582a3faa1e.zip FreeBSD-src-fbddcbbc7a27f2e614e2b78cc244e5582a3faa1e.tar.gz | |
Allow the attach routine to fail gracefully and not panic the system.
| -rw-r--r-- | sys/dev/ed/if_ed.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c index cbfabd2..13a5468 100644 --- a/sys/dev/ed/if_ed.c +++ b/sys/dev/ed/if_ed.c @@ -389,7 +389,8 @@ ed_detach(device_t dev) callout_drain(&sc->tick_ch); ether_ifdetach(ifp); } - bus_teardown_intr(dev, sc->irq_res, sc->irq_handle); + if (sc->irq_res != NULL && sc->irq_handle) + bus_teardown_intr(dev, sc->irq_res, sc->irq_handle); ed_release_resources(dev); ED_LOCK_DESTROY(sc); bus_generic_detach(dev); |
