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/hp300/dev | |
| 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/hp300/dev')
| -rw-r--r-- | sys/arch/hp300/dev/sti_sgc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/arch/hp300/dev/sti_sgc.c b/sys/arch/hp300/dev/sti_sgc.c index f504621a9f2..c17500431ce 100644 --- a/sys/arch/hp300/dev/sti_sgc.c +++ b/sys/arch/hp300/dev/sti_sgc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sti_sgc.c,v 1.12 2007/01/06 20:10:57 miod Exp $ */ +/* $OpenBSD: sti_sgc.c,v 1.13 2007/01/11 21:58:04 miod Exp $ */ /* * Copyright (c) 2005, Miodrag Vallat @@ -119,7 +119,8 @@ sti_sgc_attach(struct device *parent, struct device *self, void *aux) for (i = 1; i < STI_REGION_MAX; i++) sc->bases[i] = base; - sti_attach_common(sc, STI_CODEBASE_M68K); + if (sti_attach_common(sc, STI_CODEBASE_M68K) != 0) + return; } sti_end_attach(sc); |