|
@@ -1003,9 +1003,8 @@ static int dgnc_tty_open(struct tty_struct *tty, struct file *file)
|
|
|
* touched safely, the close routine will signal the
|
|
|
* ch_flags_wait to wake us back up.
|
|
|
*/
|
|
|
- rc = wait_event_interruptible(ch->ch_flags_wait,
|
|
|
- (((ch->ch_tun.un_flags | ch->ch_pun.un_flags) &
|
|
|
- UN_CLOSING) == 0));
|
|
|
+ rc = wait_event_interruptible(ch->ch_flags_wait, (((ch->ch_tun.un_flags |
|
|
|
+ ch->ch_pun.un_flags) & UN_CLOSING) == 0));
|
|
|
|
|
|
/* If ret is non-zero, user ctrl-c'ed us */
|
|
|
if (rc)
|
|
@@ -1228,12 +1227,12 @@ static int dgnc_block_til_ready(struct tty_struct *tty,
|
|
|
* from the current value.
|
|
|
*/
|
|
|
if (sleep_on_un_flags)
|
|
|
- retval = wait_event_interruptible(un->un_flags_wait,
|
|
|
- (old_flags != (ch->ch_tun.un_flags |
|
|
|
- ch->ch_pun.un_flags)));
|
|
|
+ retval = wait_event_interruptible
|
|
|
+ (un->un_flags_wait, (old_flags != (ch->ch_tun.un_flags |
|
|
|
+ ch->ch_pun.un_flags)));
|
|
|
else
|
|
|
retval = wait_event_interruptible(ch->ch_flags_wait,
|
|
|
- (old_flags != ch->ch_flags));
|
|
|
+ (old_flags != ch->ch_flags));
|
|
|
|
|
|
/*
|
|
|
* We got woken up for some reason.
|