diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-11 17:53:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-11 17:53:53 -0400 |
| commit | 871039f02f8ec4ab2e5e9010718caa8e085786f1 (patch) | |
| tree | f0d2b3127fc48c862967d68c46c2d46668137515 /drivers/block/paride/pf.c | |
| parent | e4077e018b5ead3de9951fc01d8bf12eeeeeefed (diff) | |
| parent | 4a1032faac94ebbf647460ae3e06fc21146eb280 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/stmmac/stmmac_main.c
drivers/net/wireless/wl12xx/wl1271_cmd.c
drivers/net/wireless/wl12xx/wl1271_main.c
drivers/net/wireless/wl12xx/wl1271_spi.c
net/core/ethtool.c
net/mac80211/scan.c
Diffstat (limited to 'drivers/block/paride/pf.c')
| -rw-r--r-- | drivers/block/paride/pf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c index ddb4f9abd480..c059aab3006b 100644 --- a/drivers/block/paride/pf.c +++ b/drivers/block/paride/pf.c | |||
| @@ -391,11 +391,11 @@ static int pf_wait(struct pf_unit *pf, int go, int stop, char *fun, char *msg) | |||
| 391 | && (j++ < PF_SPIN)) | 391 | && (j++ < PF_SPIN)) |
| 392 | udelay(PF_SPIN_DEL); | 392 | udelay(PF_SPIN_DEL); |
| 393 | 393 | ||
| 394 | if ((r & (STAT_ERR & stop)) || (j >= PF_SPIN)) { | 394 | if ((r & (STAT_ERR & stop)) || (j > PF_SPIN)) { |
| 395 | s = read_reg(pf, 7); | 395 | s = read_reg(pf, 7); |
| 396 | e = read_reg(pf, 1); | 396 | e = read_reg(pf, 1); |
| 397 | p = read_reg(pf, 2); | 397 | p = read_reg(pf, 2); |
| 398 | if (j >= PF_SPIN) | 398 | if (j > PF_SPIN) |
| 399 | e |= 0x100; | 399 | e |= 0x100; |
| 400 | if (fun) | 400 | if (fun) |
| 401 | printk("%s: %s %s: alt=0x%x stat=0x%x err=0x%x" | 401 | printk("%s: %s %s: alt=0x%x stat=0x%x err=0x%x" |