diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2007-01-11 21:58:06 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2007-01-11 21:58:06 +0000 |
| commit | 53219792afd8a52ba75fe306e99a3f848bc62cdf (patch) | |
| tree | 656fc06ee4b46aa4cb22e9ddecfde21db9005e35 /sys/arch/hppa | |
| parent | cd8a72824ca6117eb03f1f980ac722941bc83b86 (diff) | |
Allow sti_attach_common() to return an error code, and do not fall into
sti_end_attach() if an error has occured.
ok mickey@
Diffstat (limited to 'sys/arch/hppa')
| -rw-r--r-- | sys/arch/hppa/dev/sti_sgc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/hppa/dev/sti_sgc.c b/sys/arch/hppa/dev/sti_sgc.c index 4729b8e9e1f..49dccc79a62 100644 --- a/sys/arch/hppa/dev/sti_sgc.c +++ b/sys/arch/hppa/dev/sti_sgc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sti_sgc.c,v 1.34 2006/12/18 18:57:26 miod Exp $ */ +/* $OpenBSD: sti_sgc.c,v 1.35 2007/01/11 21:58:05 miod Exp $ */ /* * Copyright (c) 2000-2003 Michael Shalayeff @@ -230,6 +230,6 @@ sti_sgc_attach(parent, self, aux) if (ca->ca_hpa == (hppa_hpa_t)PAGE0->mem_cons.pz_hpa) sc->sc_flags |= STI_CONSOLE; - sti_attach_common(sc, STI_CODEBASE_PA); - startuphook_establish(sti_end_attach, sc); + if (sti_attach_common(sc, STI_CODEBASE_PA) == 0) + startuphook_establish(sti_end_attach, sc); } |