Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 96944
b: refs/heads/master
c: a13db78
h: refs/heads/master
v: v3
  • Loading branch information
Mikael Pettersson authored and Jeff Garzik committed May 19, 2008
1 parent 39a8cf9 commit 30dd992
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 07633b5d0723ce2ec31262e1096dcf61311bf078
refs/heads/master: a13db78e2209ebfe1898207f53c353ed836d4a53
7 changes: 3 additions & 4 deletions trunk/drivers/ata/sata_promise.c
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,7 @@ static void pdc_thaw(struct ata_port *ap)
u32 tmp;

/* clear IRQ */
readl(mmio + PDC_INT_SEQMASK);
readl(mmio + PDC_COMMAND);

/* turn IRQ back on */
tmp = readl(mmio + PDC_CTLSTAT);
Expand Down Expand Up @@ -781,10 +781,9 @@ static inline unsigned int pdc_host_intr(struct ata_port *ap,

static void pdc_irq_clear(struct ata_port *ap)
{
struct ata_host *host = ap->host;
void __iomem *mmio = host->iomap[PDC_MMIO_BAR];
void __iomem *mmio = ap->ioaddr.cmd_addr;

readl(mmio + PDC_INT_SEQMASK);
readl(mmio + PDC_COMMAND);
}

static irqreturn_t pdc_interrupt(int irq, void *dev_instance)
Expand Down

0 comments on commit 30dd992

Please sign in to comment.