From: James Bottomley <jejb@mulgrave.(none)>
Date: Tue, 8 Nov 2005 17:50:26 +0000 (-0500)
Subject: Merge by hand (conflicts between pending drivers and kfree cleanups)
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=383f9749505cef0a30dbd7109db7fe469aa64753;p=linux-edison.git

Merge by hand (conflicts between pending drivers and kfree cleanups)

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
---

383f9749505cef0a30dbd7109db7fe469aa64753
diff --cc drivers/block/cciss.c
index a97c80b5773,482786068ff..e239a6c2923
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@@ -3031,7 -3163,12 +3160,11 @@@ static int __devinit cciss_init_one(str
  	return(1);
  
  clean4:
+ #ifdef CONFIG_CISS_SCSI_TAPE
+ 	if(hba[i]->scsi_rejects.complete)
+ 		kfree(hba[i]->scsi_rejects.complete);
+ #endif
 -	if(hba[i]->cmd_pool_bits)
 -               	kfree(hba[i]->cmd_pool_bits);
 +	kfree(hba[i]->cmd_pool_bits);
  	if(hba[i]->cmd_pool)
  		pci_free_consistent(hba[i]->pdev,
  			NR_CMDS * sizeof(CommandList_struct),