diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-29 03:55:47 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-29 03:55:47 -0500 |
| commit | b71d4da092801634d04190693a38ca03bdbe2505 (patch) | |
| tree | e4adc88ade5832b844768c114b15d4d97253c4d0 /drivers/scsi | |
| parent | 656563e32c3f1dfdc35b3944305ece1c5dfeade5 (diff) | |
| parent | 624f54be206adf970cd8eece16446b027913e533 (diff) | |
| download | kernel_samsung_smdk4412-b71d4da092801634d04190693a38ca03bdbe2505.zip kernel_samsung_smdk4412-b71d4da092801634d04190693a38ca03bdbe2505.tar.gz kernel_samsung_smdk4412-b71d4da092801634d04190693a38ca03bdbe2505.tar.bz2 | |
Merge branch 'master'
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/dpt_i2o.c | 9 | ||||
| -rw-r--r-- | drivers/scsi/scsi.c | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c index c28e3ae..418fc7b 100644 --- a/drivers/scsi/dpt_i2o.c +++ b/drivers/scsi/dpt_i2o.c @@ -816,7 +816,7 @@ static int adpt_hba_reset(adpt_hba* pHba) static void adpt_i2o_sys_shutdown(void) { adpt_hba *pHba, *pNext; - struct adpt_i2o_post_wait_data *p1, *p2; + struct adpt_i2o_post_wait_data *p1, *old; printk(KERN_INFO"Shutting down Adaptec I2O controllers.\n"); printk(KERN_INFO" This could take a few minutes if there are many devices attached\n"); @@ -830,13 +830,14 @@ static void adpt_i2o_sys_shutdown(void) } /* Remove any timedout entries from the wait queue. */ - p2 = NULL; // spin_lock_irqsave(&adpt_post_wait_lock, flags); /* Nothing should be outstanding at this point so just * free them */ - for(p1 = adpt_post_wait_queue; p1; p2 = p1, p1 = p2->next) { - kfree(p1); + for(p1 = adpt_post_wait_queue; p1;) { + old = p1; + p1 = p1->next; + kfree(old); } // spin_unlock_irqrestore(&adpt_post_wait_lock, flags); adpt_post_wait_queue = NULL; diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 0be60bb..180676d 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -265,10 +265,10 @@ struct scsi_cmnd *scsi_get_command(struct scsi_device *dev, gfp_t gfp_mask) spin_lock_irqsave(&dev->list_lock, flags); list_add_tail(&cmd->list, &dev->cmd_list); spin_unlock_irqrestore(&dev->list_lock, flags); + cmd->jiffies_at_alloc = jiffies; } else put_device(&dev->sdev_gendev); - cmd->jiffies_at_alloc = jiffies; return cmd; } EXPORT_SYMBOL(scsi_get_command); |