diff options
| author | Marc Balmer <mbalmer@cvs.openbsd.org> | 2007-11-23 15:43:03 +0000 |
|---|---|---|
| committer | Marc Balmer <mbalmer@cvs.openbsd.org> | 2007-11-23 15:43:03 +0000 |
| commit | c1c4b626b699581b962cfad225cc35995f811251 (patch) | |
| tree | 182988f9093b3f2c927fe6cf9d2d23199a20de4a /sys/dev/usb/if_cue.c | |
| parent | fc18ac9085d0963e9ca450f94e6bf954e9f30ef9 (diff) | |
Sanitize the use of timeouts:
Instead of calling timeout_set(..., NULL, NULL) in attach routines and
later
timeout_del(...)
timeout_set(..., func, arg)
timeout_add(..., time)
set the function and argument in the initial timeout_set() call and only
use timeout_add(..., time) later.
ok dlg, fgsch, krw, winiger
Diffstat (limited to 'sys/dev/usb/if_cue.c')
| -rw-r--r-- | sys/dev/usb/if_cue.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c index e294df90c93..b84ecbd528e 100644 --- a/sys/dev/usb/if_cue.c +++ b/sys/dev/usb/if_cue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cue.c,v 1.47 2007/10/11 18:33:14 deraadt Exp $ */ +/* $OpenBSD: if_cue.c,v 1.48 2007/11/23 15:43:02 mbalmer Exp $ */ /* $NetBSD: if_cue.c,v 1.40 2002/07/11 21:14:26 augustss Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -537,7 +537,7 @@ cue_attach(struct device *parent, struct device *self, void *aux) if_attach(ifp); ether_ifattach(ifp); - timeout_set(&sc->cue_stat_ch, NULL, NULL); + timeout_set(&sc->cue_stat_ch, cue_tick, sc); sc->cue_attached = 1; splx(s); @@ -1056,8 +1056,6 @@ cue_init(void *xsc) splx(s); - timeout_del(&sc->cue_stat_ch); - timeout_set(&sc->cue_stat_ch, cue_tick, sc); timeout_add(&sc->cue_stat_ch, hz); } |