---

yaml --- r: 29531 b: refs/heads/master c: c5fa46e h: refs/heads/master i: 29529: 201da34 29527: 64d8651 v: v3
git-mirror · Jun 20, 2006 · b4449c7 · b4449c7
1 parent 65f1f91
commit b4449c7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git 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
@@ -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;
 }