From efc987ea0cffc99eb8fb0d9f5e0fd71706134f19 Mon Sep 17 00:00:00 2001 From: Mark Lord Date: Thu, 19 Feb 2009 10:38:04 -0500 Subject: [PATCH] --- yaml --- r: 131775 b: refs/heads/master c: 6be96ac15e4d913e1f48299db083ada5321803b2 h: refs/heads/master i: 131773: 9ca499941cf111121068e2b38ea7f703ce628cc9 131771: c2163a721d8c159b9647abc2a43241910045410d 131767: 3b1aabafa93d96cc5a5ba43bee5e3f7cf72a6ecd 131759: c985c5bbfe087901e95c2144fe31234b1b6ab03f 131743: 236e986532bb19098f61cb67d6e8d69fc500cd93 131711: 0beeec3a40a1aa1bfc678d666abf27b3c37cb5c1 v: v3 --- [refs] | 2 +- trunk/drivers/ata/sata_mv.c | 20 +++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index c6ad6053dee4..fc28a233d33d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ba07d16bd62f931efec1fc8e63bf1aeebfe42a9 +refs/heads/master: 6be96ac15e4d913e1f48299db083ada5321803b2 diff --git a/trunk/drivers/ata/sata_mv.c b/trunk/drivers/ata/sata_mv.c index 4ae1a4138b47..7007edd2d451 100644 --- a/trunk/drivers/ata/sata_mv.c +++ b/trunk/drivers/ata/sata_mv.c @@ -3114,19 +3114,17 @@ static int mv_init_host(struct ata_host *host, unsigned int board_idx) writelfl(0, hc_mmio + HC_IRQ_CAUSE_OFS); } - if (!IS_SOC(hpriv)) { - /* Clear any currently outstanding host interrupt conditions */ - writelfl(0, mmio + hpriv->irq_cause_ofs); + /* 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. - * The per-port interrupts get done later as ports are set up. - */ - mv_set_main_irq_mask(host, 0, PCI_ERR); - } + /* + * enable only global host interrupts for now. + * The per-port interrupts get done later as ports are set up. + */ + mv_set_main_irq_mask(host, 0, PCI_ERR); done: return rc; }