From 8566ea7c6f9660623a6f04bc73431f761dee32c7 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 3 May 2010 17:50:45 -0400 Subject: [PATCH 321/577] Staging: hv: move ASSERT(scmnd) to a more useful location There's not much point to make sure scmnd is not NULL after an assert that would dereference scmnd. The ASSERT()'s should be removed, but until they are at least they at least can be in the right order. Signed-off-by: Bill Pemberton Cc: Hank Janssen Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman --- drivers/staging/hv/storvsc_drv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c index 5e28e4c..26b35a6 100644 --- a/drivers/staging/hv/storvsc_drv.c +++ b/drivers/staging/hv/storvsc_drv.c @@ -386,9 +386,9 @@ static void storvsc_commmand_completion(struct hv_storvsc_request *request) struct scsi_sense_hdr sense_hdr; ASSERT(request == &cmd_request->request); + ASSERT(scmnd); ASSERT((unsigned long)scmnd->host_scribble == (unsigned long)cmd_request); - ASSERT(scmnd); ASSERT(scmnd->scsi_done); DPRINT_ENTER(STORVSC_DRV); -- 1.7.0.3