summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormjacob <mjacob@FreeBSD.org>2001-10-06 19:34:43 +0000
committermjacob <mjacob@FreeBSD.org>2001-10-06 19:34:43 +0000
commit7187812d5e8d722f8d2553a54cd9737eb03aa0a6 (patch)
tree0c0813842b721cce7a9731e15e4ea407533099bf
parent9c76564553e32b45ebeec58fe24e5ad190e053ac (diff)
downloadFreeBSD-src-7187812d5e8d722f8d2553a54cd9737eb03aa0a6.zip
FreeBSD-src-7187812d5e8d722f8d2553a54cd9737eb03aa0a6.tar.gz
Whups- remember to zero the isr pointer arg.
-rw-r--r--sys/dev/isp/isp_pci.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c
index 73cdb54..c5af27e 100644
--- a/sys/dev/isp/isp_pci.c
+++ b/sys/dev/isp/isp_pci.c
@@ -835,8 +835,10 @@ isp_pci_rd_isr_2300(struct ispsoftc *isp, u_int16_t *isrp,
struct isp_pcisoftc *pcs = (struct isp_pcisoftc *) isp;
u_int32_t r2hisr;
- if ((BXR2(pcs, IspVirt2Off(isp, BIU_ISR) & BIU2100_ISR_RISC_INT)) == 0)
+ if (!(BXR2(pcs, IspVirt2Off(isp, BIU_ISR) & BIU2100_ISR_RISC_INT))) {
+ *isrp = 0;
return (0);
+ }
r2hisr = bus_space_read_4(pcs->pci_st, pcs->pci_sh,
IspVirt2Off(pcs, BIU_R2HSTSLO));
isp_prt(isp, ISP_LOGDEBUG3, "RISC2HOST ISR 0x%x", r2hisr);
OpenPOWER on IntegriCloud