diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-07-26 18:43:37 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-07-26 18:43:37 +0000 |
| commit | 062b0097478eaca2f34bf9b128b95a945310d7c8 (patch) | |
| tree | 2ca9abaf85bab97314cf4561acb3e4d1a9cacc36 /sys/dev/isa | |
| parent | e6fd3356ab661c4e7fecd8e64fb9e9fd29bd9001 (diff) | |
Calling a detach function from an attach function is no longer legal (
see a recent subr_autoconf.c commit). To resolve this problem, mark the
other attachment dead, and clean it up when the first servicing timeout
gets run.
ok kettenis
Diffstat (limited to 'sys/dev/isa')
| -rw-r--r-- | sys/dev/isa/lm78_isa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/isa/lm78_isa.c b/sys/dev/isa/lm78_isa.c index 648890d28f3..45093c8cc13 100644 --- a/sys/dev/isa/lm78_isa.c +++ b/sys/dev/isa/lm78_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lm78_isa.c,v 1.4 2008/02/17 15:04:08 kettenis Exp $ */ +/* $OpenBSD: lm78_isa.c,v 1.5 2011/07/26 18:43:36 deraadt Exp $ */ /* * Copyright (c) 2005, 2006 Mark Kettenis @@ -177,7 +177,7 @@ lm_isa_attach(struct device *parent, struct device *self, void *aux) continue; if (lmsc && lmsc->sbusaddr == sbusaddr && lmsc->chipid == sc->sc_lmsc.chipid) - config_detach(&lmsc->sc_dev, 0); + lmsc->flags = LM78_DEAD; } } |