diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 13:04:37 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 13:04:37 +0200 |
commit | 87d721ad7a37b7650dd710c88dd5c6a5bf9fe996 (patch) | |
tree | 869d633803eb7c429624d3bd16a6117816849763 /drivers/macintosh/via-maciisi.c | |
parent | Merge branch 'devel-stable' into devel (diff) | |
parent | ARM: Fix pfn_valid() for sparse memory (diff) | |
download | linux-87d721ad7a37b7650dd710c88dd5c6a5bf9fe996.tar.xz linux-87d721ad7a37b7650dd710c88dd5c6a5bf9fe996.zip |
Merge branch 'master' into devel
Diffstat (limited to 'drivers/macintosh/via-maciisi.c')
-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) } /* This could be BAD... when the ADB controller doesn't respond * for this long, it's probably not coming back :-( */ - if(count >= 50) /* Hopefully shouldn't happen */ + if (count > 50) /* Hopefully shouldn't happen */ printk(KERN_ERR "maciisi_send_request: poll timed out!\n"); } |