From 33f8f8b76355a785f973d0eed22335483267e114 Mon Sep 17 00:00:00 2001 From: Mark Lord Date: Mon, 6 Apr 2009 12:29:49 -0400 Subject: [PATCH] --- yaml --- r: 142678 b: refs/heads/master c: 44c65d169c5d2e5c872581ebc65f12710d7c3b71 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ata/sata_mv.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 82a5fd712f17..dfed457725cc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c1e9aa41b2f9afe8f26e2efe5bb4695f6c40772 +refs/heads/master: 44c65d169c5d2e5c872581ebc65f12710d7c3b71 diff --git a/trunk/drivers/ata/sata_mv.c b/trunk/drivers/ata/sata_mv.c index a377226b81c8..be9ae4fc5cbe 100644 --- a/trunk/drivers/ata/sata_mv.c +++ b/trunk/drivers/ata/sata_mv.c @@ -3734,11 +3734,13 @@ static int mv_init_host(struct ata_host *host, unsigned int board_idx) writelfl(0, hc_mmio + HC_IRQ_CAUSE_OFS); } - /* Clear any currently outstanding host interrupt conditions */ - writelfl(0, mmio + hpriv->irq_cause_ofs); + if (!IS_SOC(hpriv)) { + /* Clear any currently outstanding host interrupt conditions */ + writelfl(0, mmio + hpriv->irq_cause_ofs); - /* and unmask interrupt generation for host regs */ - writelfl(hpriv->unmask_all_irqs, mmio + hpriv->irq_mask_ofs); + /* and unmask interrupt generation for host regs */ + writelfl(hpriv->unmask_all_irqs, mmio + hpriv->irq_mask_ofs); + } /* * enable only global host interrupts for now.