diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-22 19:13:54 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-22 19:13:54 -0500 |
| commit | f01c18456993bab43067b678f56c87ca954aa43b (patch) | |
| tree | 3e0cd0cdf1a57618202b46a7126125902e3ab832 /drivers/block | |
| parent | 949ec2c8e6b7b89179b85baf6309c009e1a1b951 (diff) | |
| parent | 1c2e02750b992703a8a18634e08b04353face243 (diff) | |
| download | kernel_samsung_espresso10-f01c18456993bab43067b678f56c87ca954aa43b.zip kernel_samsung_espresso10-f01c18456993bab43067b678f56c87ca954aa43b.tar.gz kernel_samsung_espresso10-f01c18456993bab43067b678f56c87ca954aa43b.tar.bz2 | |
Merge branch 'master'
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/cciss.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 0d65394..cf39cf9 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) |