From: Andrew Morton <akpm@osdl.org>
Date: Thu, 5 Jan 2006 02:30:03 +0000 (-0800)
Subject: [SCSI] cciss: kfree(NULL) is legal
X-Git-Tag: v2.6.17-rc1~1129^2~4^2~133
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1acc0b0ba409dcf4909890fb33e0829f7fd400be;p=linux-2.6-omap-h63xx.git

[SCSI] cciss: kfree(NULL) is legal

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
---

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 0d65394707d..b9c786ee6fa 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -3251,8 +3251,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
 
 clean4:
 #ifdef CONFIG_CISS_SCSI_TAPE
-	if(hba[i]->scsi_rejects.complete)
-		kfree(hba[i]->scsi_rejects.complete);
+	kfree(hba[i]->scsi_rejects.complete);
 #endif
 	kfree(hba[i]->cmd_pool_bits);
 	if(hba[i]->cmd_pool)