summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Yan <ayan@marvell.com>2009-05-11 17:49:52 +0400
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2009-05-24 00:44:08 +0400
commit0f980a871678b7ec143fcb45b31bf9234e4585c8 (patch)
tree6178d37572dda96a16d3a21e4d5a21f79f01b7e6
parent0b84b7094e87769120def1e703b8b4d037281038 (diff)
downloadlinux-0f980a871678b7ec143fcb45b31bf9234e4585c8.tar.xz
[SCSI] mvsas: bug fix, null pointer may be used
Null pointer check to avoid corruption. Signed-off-by: Ying Chu <jasonchu@marvell.com> Signed-off-by: Andy Yan <ayan@marvell.com> Signed-off-by: Ke Wei <kewei@marvell.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
-rw-r--r--drivers/scsi/mvsas/mv_sas.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c
index 4279b5e8808a..3fc396fc050d 100644
--- a/drivers/scsi/mvsas/mv_sas.c
+++ b/drivers/scsi/mvsas/mv_sas.c
@@ -1873,11 +1873,11 @@ int mvs_slot_complete(struct mvs_info *mvi, u32 rx_desc, u32 flags)
}
out:
- if (mvi_dev)
+ if (mvi_dev) {
mvi_dev->runing_req--;
- if (sas_protocol_ata(task->task_proto))
- mvs_free_reg_set(mvi, mvi_dev);
-
+ if (sas_protocol_ata(task->task_proto))
+ mvs_free_reg_set(mvi, mvi_dev);
+ }
mvs_slot_task_free(mvi, task, slot, slot_idx);
sts = tstat->stat;