Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 89295
b: refs/heads/master
c: 8a74f1a
h: refs/heads/master
i:
  89293: 4bfe863
  89291: 29b61db
  89287: 6b9bd14
  89279: ec46b24
v: v3
  • Loading branch information
Mark Lord authored and Jeff Garzik committed Apr 17, 2008
1 parent aac9588 commit 3d963b9
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 15 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: e49856d82a887ce365637176f9f99ab68076eae8
refs/heads/master: 8a74f1a4680614dfb77fc5dfd37d0ece13b2b357
14 changes: 0 additions & 14 deletions trunk/drivers/ata/sata_mv.c
Original file line number Diff line number Diff line change
Expand Up @@ -1144,8 +1144,6 @@ static int mv_port_start(struct ata_port *ap)
struct device *dev = ap->host->dev;
struct mv_host_priv *hpriv = ap->host->private_data;
struct mv_port_priv *pp;
void __iomem *port_mmio = mv_ap_base(ap);
unsigned long flags;
int tag;

pp = devm_kzalloc(dev, sizeof(*pp), GFP_KERNEL);
Expand Down Expand Up @@ -1178,18 +1176,6 @@ static int mv_port_start(struct ata_port *ap)
pp->sg_tbl_dma[tag] = pp->sg_tbl_dma[0];
}
}

spin_lock_irqsave(&ap->host->lock, flags);

mv_edma_cfg(ap, 0);
mv_set_edma_ptrs(port_mmio, hpriv, pp);

spin_unlock_irqrestore(&ap->host->lock, flags);

/* Don't turn on EDMA here...do it before DMA commands only. Else
* we'll be unable to send non-data, PIO, etc due to restricted access
* to shadow regs.
*/
return 0;

out_port_free_dma_mem:
Expand Down

0 comments on commit 3d963b9

Please sign in to comment.