diff options
| author | joerg <joerg@NetBSD.org> | 2007-10-22 14:03:51 +0000 |
|---|---|---|
| committer | joerg <joerg@NetBSD.org> | 2007-10-22 14:03:51 +0000 |
| commit | dcf90eeb823c30ebf1f305fbefb44cde712aa41b (patch) | |
| tree | 7e3918c63e8b4da537d3acf28350355096fe9fad /sys/dev | |
| parent | f480a18fd3f6ecbfc2898800bd2076613e896722 (diff) | |
Correctly initialise sc_insert_ch and switch to
callout_setfunc/callout_schedule.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/pccbb.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c index 5e30ca8756d..aa04fd9359b 100644 --- a/sys/dev/pci/pccbb.c +++ b/sys/dev/pci/pccbb.c @@ -1,4 +1,4 @@ -/* $NetBSD: pccbb.c,v 1.148 2007/10/19 12:00:53 ad Exp $ */ +/* $NetBSD: pccbb.c,v 1.149 2007/10/22 14:03:51 joerg Exp $ */ /* * Copyright (c) 1998, 1999 and 2000 @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.148 2007/10/19 12:00:53 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.149 2007/10/22 14:03:51 joerg Exp $"); /* #define CBB_DEBUG @@ -427,6 +427,9 @@ pccbbattach(struct device *parent, struct device *self, void *aux) pccbb_attach_hook(parent, self, pa); #endif + callout_init(&sc->sc_insert_ch, 0); + callout_setfunc(&sc->sc_insert_ch, pci113x_insert, sc); + sc->sc_chipset = cb_chipset(pa->pa_id, &flags); pci_devinfo(pa->pa_id, 0, 0, devinfo, sizeof(devinfo)); @@ -1077,8 +1080,7 @@ pccbbintr(void *arg) if (sc->sc_flags & CBB_INSERTING) { callout_stop(&sc->sc_insert_ch); } - callout_reset(&sc->sc_insert_ch, hz / 5, - pci113x_insert, sc); + callout_schedule(&sc->sc_insert_ch, hz / 5); sc->sc_flags |= CBB_INSERTING; } } @@ -1155,8 +1157,7 @@ pci113x_insert(void *arg) /* who are you? */ } } else { - callout_reset(&sc->sc_insert_ch, hz / 10, - pci113x_insert, sc); + callout_schedule(&sc->sc_insert_ch, hz / 10); } } |
