Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 344412
b: refs/heads/master
c: 7f0658d
h: refs/heads/master
v: v3
  • Loading branch information
Wei Yongjun authored and Jeff Garzik committed Nov 28, 2012
1 parent 1275094 commit d5e76bc
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 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: 8b34f2cc99df7275652ac6b522a767d750a02b3a
refs/heads/master: 7f0658d37f2d9a3a251f5b0bf1877eb9ec593f04
2 changes: 0 additions & 2 deletions trunk/drivers/ata/sata_inic162x.c
Original file line number Diff line number Diff line change
Expand Up @@ -273,12 +273,10 @@ static void inic_reset_port(void __iomem *port_base)
static int inic_scr_read(struct ata_link *link, unsigned sc_reg, u32 *val)
{
void __iomem *scr_addr = inic_port_base(link->ap) + PORT_SCR;
void __iomem *addr;

if (unlikely(sc_reg >= ARRAY_SIZE(scr_map)))
return -EINVAL;

addr = scr_addr + scr_map[sc_reg] * 4;
*val = readl(scr_addr + scr_map[sc_reg] * 4);

/* this controller has stuck DIAG.N, ignore it */
Expand Down

0 comments on commit d5e76bc

Please sign in to comment.