diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-05-10 09:32:46 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-05-10 09:32:46 -0400 |
| commit | 0ae28a35bcb7984838acbf28bfba9c030f8b74f0 (patch) | |
| tree | 4f449d929b5df9e126e839f388ff0fd2b52028a0 /drivers/block/paride/pt.c | |
| parent | 6f1f3d0ab5c3eeea9f04486481c25e9afdfa26c5 (diff) | |
| parent | b57f95a38233a2e73b679bea4a5453a1cc2a1cc9 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/mtd/mtdcore.c
Pull in the bdi fixes and ARM platform changes that other outstanding
patches depend on.
Diffstat (limited to 'drivers/block/paride/pt.c')
| -rw-r--r-- | drivers/block/paride/pt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c index 1e4006e18f03..bc5825fdeaab 100644 --- a/drivers/block/paride/pt.c +++ b/drivers/block/paride/pt.c | |||
| @@ -274,11 +274,11 @@ static int pt_wait(struct pt_unit *tape, int go, int stop, char *fun, char *msg) | |||
| 274 | && (j++ < PT_SPIN)) | 274 | && (j++ < PT_SPIN)) |
| 275 | udelay(PT_SPIN_DEL); | 275 | udelay(PT_SPIN_DEL); |
| 276 | 276 | ||
| 277 | if ((r & (STAT_ERR & stop)) || (j >= PT_SPIN)) { | 277 | if ((r & (STAT_ERR & stop)) || (j > PT_SPIN)) { |
| 278 | s = read_reg(pi, 7); | 278 | s = read_reg(pi, 7); |
| 279 | e = read_reg(pi, 1); | 279 | e = read_reg(pi, 1); |
| 280 | p = read_reg(pi, 2); | 280 | p = read_reg(pi, 2); |
| 281 | if (j >= PT_SPIN) | 281 | if (j > PT_SPIN) |
| 282 | e |= 0x100; | 282 | e |= 0x100; |
| 283 | if (fun) | 283 | if (fun) |
| 284 | printk("%s: %s %s: alt=0x%x stat=0x%x err=0x%x" | 284 | printk("%s: %s %s: alt=0x%x stat=0x%x err=0x%x" |