Commit b607fe3a authored by Russell King's avatar Russell King

[SERIAL] Don't return -ERESTARTSYS if signals aren't pending.

parent 947af82f
...@@ -1490,8 +1490,7 @@ uart_block_til_ready(struct file *filp, struct uart_state *state) ...@@ -1490,8 +1490,7 @@ uart_block_til_ready(struct file *filp, struct uart_state *state)
return -ERESTARTSYS; return -ERESTARTSYS;
if (!info->tty || tty_hung_up_p(filp)) if (!info->tty || tty_hung_up_p(filp))
return (port->flags & UPF_HUP_NOTIFY) ? return -EAGAIN;
-EAGAIN : -ERESTARTSYS;
return 0; return 0;
} }
...@@ -1596,8 +1595,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp) ...@@ -1596,8 +1595,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
* If the port is in the middle of closing, bail out now. * If the port is in the middle of closing, bail out now.
*/ */
if (tty_hung_up_p(filp)) { if (tty_hung_up_p(filp)) {
retval = (state->port->flags & UPF_HUP_NOTIFY) ? retval = -EAGAIN;
-EAGAIN : -ERESTARTSYS;
state->count--; state->count--;
up(&state->sem); up(&state->sem);
goto fail; goto fail;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment