From b4449c73da5d2965a278bd4a59e53629b237f44c Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Tue, 20 Jun 2006 05:08:44 -0400 Subject: [PATCH] --- yaml --- r: 29531 b: refs/heads/master c: c5fa46e175ccd02803031ea071060cdb01521736 h: refs/heads/master i: 29529: 201da348914861cafa90377c24d4244d7c9815be 29527: 64d865170b393214f804cfcddf7d4f9ea567b03c v: v3 --- [refs] | 2 +- trunk/drivers/scsi/sata_nv.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index f67cdf583cb4..4bd8be4c850d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a44efff4f8fe8139c0c4166ad5aae5f2fa5bced +refs/heads/master: c5fa46e175ccd02803031ea071060cdb01521736 diff --git a/trunk/drivers/scsi/sata_nv.c b/trunk/drivers/scsi/sata_nv.c index 19deaa42fbf0..be8650f17020 100644 --- a/trunk/drivers/scsi/sata_nv.c +++ b/trunk/drivers/scsi/sata_nv.c @@ -371,14 +371,13 @@ static irqreturn_t nv_nf2_interrupt(int irq, void *dev_instance, struct pt_regs *regs) { struct ata_host_set *host_set = dev_instance; - unsigned long flags; u8 irq_stat; irqreturn_t ret; - spin_lock_irqsave(&host_set->lock, flags); + spin_lock(&host_set->lock); irq_stat = inb(host_set->ports[0]->ioaddr.scr_addr + NV_INT_STATUS); ret = nv_do_interrupt(host_set, irq_stat); - spin_unlock_irqrestore(&host_set->lock, flags); + spin_unlock(&host_set->lock); return ret; } @@ -387,14 +386,13 @@ static irqreturn_t nv_ck804_interrupt(int irq, void *dev_instance, struct pt_regs *regs) { struct ata_host_set *host_set = dev_instance; - unsigned long flags; u8 irq_stat; irqreturn_t ret; - spin_lock_irqsave(&host_set->lock, flags); + spin_lock(&host_set->lock); irq_stat = readb(host_set->mmio_base + NV_INT_STATUS_CK804); ret = nv_do_interrupt(host_set, irq_stat); - spin_unlock_irqrestore(&host_set->lock, flags); + spin_unlock(&host_set->lock); return ret; }