diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2002-02-07 05:43:52 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2002-02-07 05:43:52 +0000 |
| commit | 6be877a99be76183f28ba0a66af7512f35dc05b6 (patch) | |
| tree | eb266e31d66d3690fe5c756bb3c1e7d43807e99a /sys/arch/hppa | |
| parent | 5f3f4310e49c6445a1e3963bd2ef82217a0f3827 (diff) | |
fix irq passing on match
Diffstat (limited to 'sys/arch/hppa')
| -rw-r--r-- | sys/arch/hppa/hppa/mainbus.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/hppa/hppa/mainbus.c b/sys/arch/hppa/hppa/mainbus.c index 5f2bdd792bd..4ef6629458a 100644 --- a/sys/arch/hppa/hppa/mainbus.c +++ b/sys/arch/hppa/hppa/mainbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mainbus.c,v 1.20 2001/12/08 02:24:06 art Exp $ */ +/* $OpenBSD: mainbus.c,v 1.21 2002/02/07 05:43:51 mickey Exp $ */ /* * Copyright (c) 1998-2001 Michael Shalayeff @@ -851,6 +851,7 @@ mbattach(parent, self, aux) bzero (&nca, sizeof(nca)); nca.ca_name = "mainbus"; nca.ca_hpa = 0; + nca.ca_irq = -1; nca.ca_hpamask = HPPA_IOSPACE; nca.ca_iot = &hppa_bustag; nca.ca_dmatag = &hppa_dmatag; @@ -904,8 +905,7 @@ mbsubmatch(parent, match, aux) ((ca->ca_hpa & ~ca->ca_hpamask) != cf->hppacf_off)) return (0); - if ((ret = (*cf->cf_attach->ca_match)(parent, match, aux)) && - cf->hppacf_irq != -1) + if ((ret = (*cf->cf_attach->ca_match)(parent, match, aux))) ca->ca_irq = cf->hppacf_irq; return ret; |