diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-05-08 21:29:27 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-05-08 21:29:27 -0400 |
commit | d585a021c0b10b0477d6b608c53e1feb8cde0507 (patch) | |
tree | 5ca059da1db7f15d4b29427644ad9c08270c885c /include/video/newport.h | |
parent | 84e5b0d00f8f84c4ae226be131d4bebbcee88bd3 (diff) | |
parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) |
Merge commit 'v2.6.30-rc5' into next
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 1f5ebeaa818f..001b935e71c4 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; |