diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /drivers/char/serial167.c | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'drivers/char/serial167.c')
| -rw-r--r-- | drivers/char/serial167.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c index 3851616ab..5142c8495 100644 --- a/drivers/char/serial167.c +++ b/drivers/char/serial167.c @@ -1500,7 +1500,7 @@ get_modem_info(struct cyclades_port * info, unsigned int *value) | ((status & CyDCD) ? TIOCM_CAR : 0) | ((status & CyDSR) ? TIOCM_DSR : 0) | ((status & CyCTS) ? TIOCM_CTS : 0); - cy_put_user(result,(unsigned long *) value); + cy_put_user(result,(unsigned int *) value); return 0; } /* get_modem_info */ @@ -2094,7 +2094,7 @@ block_til_ready(struct tty_struct *tty, struct file * filp, #endif } restore_flags(flags); - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); if (tty_hung_up_p(filp) || !(info->flags & ASYNC_INITIALIZED) ){ if (info->flags & ASYNC_HUP_NOTIFY) { |