diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-26 23:16:38 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-26 23:16:38 -0400 |
| commit | 533995ed85730a1f5f385b9ecb2d2b4b731d27b4 (patch) | |
| tree | 1dcccfbece1d9275f1c595c460492afdf7551a17 /drivers | |
| parent | cc674c81f01a6151ca00c617e5efa0812ee5fdbe (diff) | |
| parent | 9848484fad9ddeb18f18f02f9ecdcd330ac9a216 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k,m68knommu: Wire up rt_tgsigqueueinfo and perf_counter_open
m68k: Fix redefinition of pgprot_noncached
arch/m68k/include/asm/motorola_pgalloc.h: fix kunmap arg
m68k: cnt reaches -1, not 0
m68k: count can reach 51, not 50
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/macintosh/via-maciisi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/via-maciisi.c b/drivers/macintosh/via-maciisi.c index 4d686c0bdea0..9ab5b0c34f0d 100644 --- a/drivers/macintosh/via-maciisi.c +++ b/drivers/macintosh/via-maciisi.c | |||
| @@ -288,7 +288,7 @@ static void maciisi_sync(struct adb_request *req) | |||
| 288 | } | 288 | } |
| 289 | /* This could be BAD... when the ADB controller doesn't respond | 289 | /* This could be BAD... when the ADB controller doesn't respond |
| 290 | * for this long, it's probably not coming back :-( */ | 290 | * for this long, it's probably not coming back :-( */ |
| 291 | if(count >= 50) /* Hopefully shouldn't happen */ | 291 | if (count > 50) /* Hopefully shouldn't happen */ |
| 292 | printk(KERN_ERR "maciisi_send_request: poll timed out!\n"); | 292 | printk(KERN_ERR "maciisi_send_request: poll timed out!\n"); |
| 293 | } | 293 | } |
| 294 | 294 | ||