Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a crash at shutdown/reboot that was caused by ath(4) registering with

Browse Source 
pmf's network class even though the ath device may not have attached
properly.

OK jmcneill
This commit is contained in:
mjf 2007-12-14 00:55:52 +00:00
parent 0790e7df9b
commit 003edc95d6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/dev/pci/if_ath_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ath_pci.c,v 1.22 2007/12/09 20:28:08 jmcneill Exp $ */ /* $NetBSD: if_ath_pci.c,v 1.23 2007/12/14 00:55:52 mjf Exp $ */
/*- /*-
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@ -41,7 +41,7 @@
__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath_pci.c,v 1.11 2005/01/18 18:08:16 sam Exp $"); __FBSDID("$FreeBSD: src/sys/dev/ath/if_ath_pci.c,v 1.11 2005/01/18 18:08:16 sam Exp $");
#endif #endif
#ifdef __NetBSD__ #ifdef __NetBSD__
__KERNEL_RCSID(0, "$NetBSD: if_ath_pci.c,v 1.22 2007/12/09 20:28:08 jmcneill Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_ath_pci.c,v 1.23 2007/12/14 00:55:52 mjf Exp $");
#endif #endif
/* /*
@ -241,12 +241,12 @@ ath_pci_attach(struct device *parent, struct device *self, void *aux)
if (!pmf_device_register(self, NULL, ath_pci_resume)) if (!pmf_device_register(self, NULL, ath_pci_resume))
aprint_error_dev(self, "couldn't establish power handler\n"); aprint_error_dev(self, "couldn't establish power handler\n");
else
pmf_class_network_register(self, &sc->sc_if);
if (ath_attach(PCI_PRODUCT(pa->pa_id), sc) == 0) if (ath_attach(PCI_PRODUCT(pa->pa_id), sc) != 0)
return; return;
pmf_class_network_register(self, &sc->sc_if);
pci_intr_disestablish(pc, psc->sc_ih); pci_intr_disestablish(pc, psc->sc_ih);
bad2: /* XXX */ bad2: /* XXX */
bad1: /* XXX */ bad1: /* XXX */