summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorVisa Hankala <visa@cvs.openbsd.org>2017-11-05 05:09:51 +0000
committerVisa Hankala <visa@cvs.openbsd.org>2017-11-05 05:09:51 +0000
commit8a13322f25373c5988a28ed28c5bdcde0597377b (patch)
treedcbc6be2e3a103a449f8ae064cf05b8744a2b192 /sys
parent97e2ac8e57b8b49ddf554e1369e34489ae0e3831 (diff)
Handle failure.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/octeon/dev/cn30xxpow.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/arch/octeon/dev/cn30xxpow.c b/sys/arch/octeon/dev/cn30xxpow.c
index 443e0430134..0e2bd20c0dd 100644
--- a/sys/arch/octeon/dev/cn30xxpow.c
+++ b/sys/arch/octeon/dev/cn30xxpow.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cn30xxpow.c,v 1.12 2017/11/05 05:08:07 visa Exp $ */
+/* $OpenBSD: cn30xxpow.c,v 1.13 2017/11/05 05:09:50 visa Exp $ */
/*
* Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -214,7 +214,8 @@ cn30xxpow_intr_establish(int group, int level,
KASSERT(group < 16);
pow_ih = malloc(sizeof(*pow_ih), M_DEVBUF, M_NOWAIT);
- KASSERT(pow_ih != NULL); /* XXX handle failure */
+ if (pow_ih == NULL)
+ return NULL;
pow_ih->pi_ih = octeon_intr_establish(
ffs64(CIU_INTX_SUM0_WORKQ_0) - 1 + group,
@@ -222,7 +223,7 @@ cn30xxpow_intr_establish(int group, int level,
cn30xxpow_intr, pow_ih, what);
KASSERT(pow_ih->pi_ih != NULL);
- pow_ih->pi_sc = &cn30xxpow_softc; /* XXX */
+ pow_ih->pi_sc = &cn30xxpow_softc;
pow_ih->pi_group = group;
pow_ih->pi_cb = cb;
pow_ih->pi_data = data;