diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-04-01 17:58:39 -0400 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-04-01 17:58:39 -0400 |
| commit | f36345ff9a4a77f2cc576a2777b6256d5c8798fa (patch) | |
| tree | 7ae4c607f6baae74060c2e385f744e171fbbf92b /include/video/newport.h | |
| parent | 1aacc064e029f0017384e463121b98f06d3a2cc3 (diff) | |
| parent | 8b53ef33d9d8fa5f771ae11cc6a6e7bc0182beec (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'include/video/newport.h')
| -rw-r--r-- | include/video/newport.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/video/newport.h b/include/video/newport.h index 1f5ebeaa818..001b935e71c 100644 --- a/include/video/newport.h +++ b/include/video/newport.h | |||
| @@ -453,7 +453,7 @@ static __inline__ int newport_wait(struct newport_regs *regs) | |||
| 453 | { | 453 | { |
| 454 | int t = BUSY_TIMEOUT; | 454 | int t = BUSY_TIMEOUT; |
| 455 | 455 | ||
| 456 | while (t--) | 456 | while (--t) |
| 457 | if (!(regs->cset.status & NPORT_STAT_GBUSY)) | 457 | if (!(regs->cset.status & NPORT_STAT_GBUSY)) |
| 458 | break; | 458 | break; |
| 459 | return !t; | 459 | return !t; |
| @@ -463,7 +463,7 @@ static __inline__ int newport_bfwait(struct newport_regs *regs) | |||
| 463 | { | 463 | { |
| 464 | int t = BUSY_TIMEOUT; | 464 | int t = BUSY_TIMEOUT; |
| 465 | 465 | ||
| 466 | while (t--) | 466 | while (--t) |
| 467 | if(!(regs->cset.status & NPORT_STAT_BBUSY)) | 467 | if(!(regs->cset.status & NPORT_STAT_BBUSY)) |
| 468 | break; | 468 | break; |
| 469 | return !t; | 469 | return !t; |