Merge branch 'master'

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 0d65394707db..cf39cf9aac25 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -2137,7 +2137,7 @@ static void start_io( ctlr_info_t *h)
                         break;
                 }
 
-                /* Get the frist entry from the Request Q */ 
+                /* Get the first entry from the Request Q */ 
                 removeQ(&(h->reqQ), c);
                 h->Qdepth--;
         
@@ -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)