mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-28 16:43:09 +00:00
Code Issues Releases Activity

- Remove duplicate call to callout_handle_init() in pcn_attach().

Browse Source 
- Conditionalize mtx_destroy() in pcn_attach().
- Assert driver lock in pcn_intr().

Submitted by:	 Hiten Pandya <hiten@unixdaemons.com>
This commit is contained in:
Matthew N. Dodd 2003-02-08 20:38:26 +00:00
parent 8cf5ed5125
commit 31d20f96fc
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=110567
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/pci/if_pcn.c
View File

@ -657,7 +657,6 @@ pcn_attach(dev)
* Call MI attach routine.
*/
ether_ifattach(ifp, (u_int8_t *) eaddr);
callout_handle_init(&sc->pcn_stat_ch);
PCN_UNLOCK(sc);
return(0);
@ -671,7 +670,8 @@ pcn_attach(dev)
if (sc->pcn_res)
bus_release_resource(dev, PCN_RES, PCN_RID, sc->pcn_res);
mtx_destroy(&sc->pcn_mtx);
if (mtx_initialized(&sc->mtx) != 0)
mtx_destroy(&sc->pcn_mtx);
return(error);
}
@ -976,6 +976,8 @@ pcn_intr(arg)
return;
}
PCN_LOCK(sc);
CSR_WRITE_4(sc, PCN_IO32_RAP, PCN_CSR_CSR);
while ((status = CSR_READ_4(sc, PCN_IO32_RDP)) & PCN_CSR_INTR) {
@ -996,6 +998,7 @@ pcn_intr(arg)
if (ifp->if_snd.ifq_head != NULL)
pcn_start(ifp);
PCN_UNLOCK(sc);
return;
}