diff options
author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-22 13:10:49 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-22 13:10:49 -0400 |
commit | 80bd6d7f5e0d872a0f5a151473d2a39d95d210a8 (patch) | |
tree | b3a36048d6b7de88f7e906624ecb4b98816bb736 /drivers/scsi/eata_pio.c | |
parent | 949d33e70f2c3e93bfe5265a50e40175b1ab1ec1 (diff) | |
parent | 2a5a68b840cbab31baab2d9b2e1e6de3b289ae1e (diff) |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/scsi/eata_pio.c')
-rw-r--r-- | drivers/scsi/eata_pio.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/scsi/eata_pio.c b/drivers/scsi/eata_pio.c index 0ee49dc50b85..04a06b71a5e2 100644 --- a/drivers/scsi/eata_pio.c +++ b/drivers/scsi/eata_pio.c | |||
@@ -486,8 +486,11 @@ static int eata_pio_host_reset(struct scsi_cmnd *cmd) | |||
486 | 486 | ||
487 | DBG(DBG_ABNORM, printk(KERN_WARNING "eata_pio_reset called pid:%ld target:" " %x lun: %x reason %x\n", cmd->pid, cmd->device->id, cmd->device->lun, cmd->abort_reason)); | 487 | DBG(DBG_ABNORM, printk(KERN_WARNING "eata_pio_reset called pid:%ld target:" " %x lun: %x reason %x\n", cmd->pid, cmd->device->id, cmd->device->lun, cmd->abort_reason)); |
488 | 488 | ||
489 | spin_lock_irq(host->host_lock); | ||
490 | |||
489 | if (HD(cmd)->state == RESET) { | 491 | if (HD(cmd)->state == RESET) { |
490 | printk(KERN_WARNING "eata_pio_reset: exit, already in reset.\n"); | 492 | printk(KERN_WARNING "eata_pio_reset: exit, already in reset.\n"); |
493 | spin_unlock_irq(host->host_lock); | ||
491 | return FAILED; | 494 | return FAILED; |
492 | } | 495 | } |
493 | 496 | ||
@@ -536,6 +539,8 @@ static int eata_pio_host_reset(struct scsi_cmnd *cmd) | |||
536 | 539 | ||
537 | HD(cmd)->state = 0; | 540 | HD(cmd)->state = 0; |
538 | 541 | ||
542 | spin_unlock_irq(host->host_lock); | ||
543 | |||
539 | if (success) { /* hmmm... */ | 544 | if (success) { /* hmmm... */ |
540 | DBG(DBG_ABNORM, printk(KERN_WARNING "eata_pio_reset: exit, success.\n")); | 545 | DBG(DBG_ABNORM, printk(KERN_WARNING "eata_pio_reset: exit, success.\n")); |
541 | return SUCCESS; | 546 | return SUCCESS; |