diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/scsi/sata_nv.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/scsi/sata_nv.c b/drivers/scsi/sata_nv.c index 19deaa42fbf0..be8650f17020 100644 --- a/drivers/scsi/sata_nv.c +++ b/drivers/scsi/sata_nv.c | |||
@@ -371,14 +371,13 @@ static irqreturn_t nv_nf2_interrupt(int irq, void *dev_instance, | |||
371 | struct pt_regs *regs) | 371 | struct pt_regs *regs) |
372 | { | 372 | { |
373 | struct ata_host_set *host_set = dev_instance; | 373 | struct ata_host_set *host_set = dev_instance; |
374 | unsigned long flags; | ||
375 | u8 irq_stat; | 374 | u8 irq_stat; |
376 | irqreturn_t ret; | 375 | irqreturn_t ret; |
377 | 376 | ||
378 | spin_lock_irqsave(&host_set->lock, flags); | 377 | spin_lock(&host_set->lock); |
379 | irq_stat = inb(host_set->ports[0]->ioaddr.scr_addr + NV_INT_STATUS); | 378 | irq_stat = inb(host_set->ports[0]->ioaddr.scr_addr + NV_INT_STATUS); |
380 | ret = nv_do_interrupt(host_set, irq_stat); | 379 | ret = nv_do_interrupt(host_set, irq_stat); |
381 | spin_unlock_irqrestore(&host_set->lock, flags); | 380 | spin_unlock(&host_set->lock); |
382 | 381 | ||
383 | return ret; | 382 | return ret; |
384 | } | 383 | } |
@@ -387,14 +386,13 @@ static irqreturn_t nv_ck804_interrupt(int irq, void *dev_instance, | |||
387 | struct pt_regs *regs) | 386 | struct pt_regs *regs) |
388 | { | 387 | { |
389 | struct ata_host_set *host_set = dev_instance; | 388 | struct ata_host_set *host_set = dev_instance; |
390 | unsigned long flags; | ||
391 | u8 irq_stat; | 389 | u8 irq_stat; |
392 | irqreturn_t ret; | 390 | irqreturn_t ret; |
393 | 391 | ||
394 | spin_lock_irqsave(&host_set->lock, flags); | 392 | spin_lock(&host_set->lock); |
395 | irq_stat = readb(host_set->mmio_base + NV_INT_STATUS_CK804); | 393 | irq_stat = readb(host_set->mmio_base + NV_INT_STATUS_CK804); |
396 | ret = nv_do_interrupt(host_set, irq_stat); | 394 | ret = nv_do_interrupt(host_set, irq_stat); |
397 | spin_unlock_irqrestore(&host_set->lock, flags); | 395 | spin_unlock(&host_set->lock); |
398 | 396 | ||
399 | return ret; | 397 | return ret; |
400 | } | 398 | } |