From 4ef01b172124c3a7b1b00a7f023ebc76b6d1edea Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Sat, 28 Jun 2008 01:49:02 +0900 Subject: [PATCH] --- yaml --- r: 98671 b: refs/heads/master c: ea0c62f7cf70f13a67830471b613337bd0c9a62e h: refs/heads/master i: 98669: c644f21a6567b2e2a1a31dbb37914594a7870bac 98667: 9190cc9f5a75aa350e8f0bc33933c4fadf04677b 98663: db309331ee085c143db0fcbdfc6d50f1773459c3 98655: b81700f93e73d83b1753c51111610f3f9c81b53c v: v3 --- [refs] | 2 +- trunk/drivers/ata/ahci.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index a9f80c91ba7d..ad302d67549f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 464b3286b4aa459059c6fda85ba55185fd21d9fc +refs/heads/master: ea0c62f7cf70f13a67830471b613337bd0c9a62e diff --git a/trunk/drivers/ata/ahci.c b/trunk/drivers/ata/ahci.c index 6a4a2a25d97a..061817a3a0e5 100644 --- a/trunk/drivers/ata/ahci.c +++ b/trunk/drivers/ata/ahci.c @@ -1777,7 +1777,7 @@ static irqreturn_t ahci_interrupt(int irq, void *dev_instance) struct ahci_host_priv *hpriv; unsigned int i, handled = 0; void __iomem *mmio; - u32 irq_stat, irq_ack = 0; + u32 irq_stat; VPRINTK("ENTER\n"); @@ -1809,14 +1809,11 @@ static irqreturn_t ahci_interrupt(int irq, void *dev_instance) "interrupt on disabled port %u\n", i); } - irq_ack |= (1 << i); - } - - if (irq_ack) { - writel(irq_ack, mmio + HOST_IRQ_STAT); handled = 1; } + writel(irq_stat, mmio + HOST_IRQ_STAT); + spin_unlock(&host->lock); VPRINTK("EXIT\n");