diff options
| author | Alexander Viro <viro@www.linux.org.uk> | 2005-04-03 18:06:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-03 18:06:05 -0700 |
| commit | 376b07691ec54a44925b4fee024c089b8b7b6616 (patch) | |
| tree | af6e568562098b2065f6a5ac97d64dfc65b98d8f | |
| parent | 1fa6bac57b20c8250874387bdd9df6b8fe8340d3 (diff) | |
[PATCH] generic_serial.c portability fix
gs_wait_tx_flushed() should have its second argument (timeout) unsigned
long, not int. One of the callers passes it MAX_SCHEDULE_TIMEOUT and
function itself compares argument with that value. Since that's
LONG_MAX, we get breakage on all 64bit platforms.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
| -rw-r--r-- | drivers/char/generic_serial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/generic_serial.c b/drivers/char/generic_serial.c index 5c8600b8dbe6b..204a7302a4a95 100644 --- a/drivers/char/generic_serial.c +++ b/drivers/char/generic_serial.c @@ -296,7 +296,7 @@ static int gs_real_chars_in_buffer(struct tty_struct *tty) } -static int gs_wait_tx_flushed (void * ptr, int timeout) +static int gs_wait_tx_flushed (void * ptr, unsigned long timeout) { struct gs_port *port = ptr; unsigned long end_jiffies; |