From fdf2a3468ac2c5dc008b601576435c797f92abf8 Mon Sep 17 00:00:00 2001 From: Olivier Houchard Date: Fri, 20 Feb 2004 20:36:55 +0000 Subject: [PATCH] Do not test if pDCB is not NULL, we dereference it before anyway, and it should not happen. Add a KASSERT instead. Reported by: Ted Unangst Spotted out by: cperciva --- sys/dev/trm/trm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/dev/trm/trm.c b/sys/dev/trm/trm.c index 42aa101349a..00a507f27fd 100644 --- a/sys/dev/trm/trm.c +++ b/sys/dev/trm/trm.c @@ -1334,11 +1334,10 @@ void *vpACB; if (scsi_intstatus & (INT_BUSSERVICE | INT_CMDDONE)) { pDCB = pACB->pActiveDCB; + KASSERT(pDCB != NULL, ("no active DCB")); pSRB = pDCB->pActiveSRB; - if (pDCB) { - if (pDCB->DCBFlag & ABORT_DEV_) + if (pDCB->DCBFlag & ABORT_DEV_) trm_EnableMsgOutAbort1(pACB, pSRB); - } phase = (u_int16_t) pSRB->ScsiPhase; /* phase: */ stateV = (void *) trm_SCSI_phase0[phase]; stateV(pACB, pSRB, &scsi_status);