diff options
Diffstat (limited to 'drivers/scsi/NCR53C9x.c')
-rw-r--r-- | drivers/scsi/NCR53C9x.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/scsi/NCR53C9x.c b/drivers/scsi/NCR53C9x.c index 74b93564a258..6ceabbd42a3d 100644 --- a/drivers/scsi/NCR53C9x.c +++ b/drivers/scsi/NCR53C9x.c | |||
@@ -94,7 +94,7 @@ enum { | |||
94 | }; | 94 | }; |
95 | 95 | ||
96 | /* The master ring of all esp hosts we are managing in this driver. */ | 96 | /* The master ring of all esp hosts we are managing in this driver. */ |
97 | struct NCR_ESP *espchain; | 97 | static struct NCR_ESP *espchain; |
98 | int nesps = 0, esps_in_use = 0, esps_running = 0; | 98 | int nesps = 0, esps_in_use = 0, esps_running = 0; |
99 | 99 | ||
100 | irqreturn_t esp_intr(int irq, void *dev_id, struct pt_regs *pregs); | 100 | irqreturn_t esp_intr(int irq, void *dev_id, struct pt_regs *pregs); |
@@ -1467,14 +1467,12 @@ int esp_reset(Scsi_Cmnd *SCptr) | |||
1467 | { | 1467 | { |
1468 | struct NCR_ESP *esp = (struct NCR_ESP *) SCptr->device->host->hostdata; | 1468 | struct NCR_ESP *esp = (struct NCR_ESP *) SCptr->device->host->hostdata; |
1469 | 1469 | ||
1470 | spin_lock_irq(esp->ehost->host_lock); | ||
1470 | (void) esp_do_resetbus(esp, esp->eregs); | 1471 | (void) esp_do_resetbus(esp, esp->eregs); |
1471 | |||
1472 | spin_unlock_irq(esp->ehost->host_lock); | 1472 | spin_unlock_irq(esp->ehost->host_lock); |
1473 | 1473 | ||
1474 | wait_event(esp->reset_queue, (esp->resetting_bus == 0)); | 1474 | wait_event(esp->reset_queue, (esp->resetting_bus == 0)); |
1475 | 1475 | ||
1476 | spin_lock_irq(esp->ehost->host_lock); | ||
1477 | |||
1478 | return SUCCESS; | 1476 | return SUCCESS; |
1479 | } | 1477 | } |
1480 | 1478 | ||