Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
tty
/
serial
/
68328serial.c
diff --git
a/kernel/drivers/tty/serial/68328serial.c
b/kernel/drivers/tty/serial/68328serial.c
index
5dc9c4b
..
0140ba4
100644
(file)
--- a/
kernel/drivers/tty/serial/68328serial.c
+++ b/
kernel/drivers/tty/serial/68328serial.c
@@
-508,7
+508,8
@@
static void change_speed(struct m68k_serial *info, struct tty_struct *tty)
int i;
cflag = tty->termios.c_cflag;
int i;
cflag = tty->termios.c_cflag;
- if (!(port = info->port))
+ port = info->port;
+ if (!port)
return;
ustcnt = uart->ustcnt;
return;
ustcnt = uart->ustcnt;
@@
-559,8
+560,8
@@
static void rs_fair_output(void)
struct m68k_serial *info = &m68k_soft[0];
char c;
struct m68k_serial *info = &m68k_soft[0];
char c;
- if (info ==
0
) return;
- if (info->xmit_buf ==
0
) return;
+ if (info ==
NULL
) return;
+ if (info->xmit_buf ==
NULL
) return;
local_irq_save(flags);
left = info->xmit_cnt;
local_irq_save(flags);
left = info->xmit_cnt;
@@
-1070,7
+1071,6
@@
static void rs_close(struct tty_struct *tty, struct file * filp)
wake_up_interruptible(&port->open_wait);
}
port->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
wake_up_interruptible(&port->open_wait);
}
port->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
- wake_up_interruptible(&port->close_wait);
local_irq_restore(flags);
}
local_irq_restore(flags);
}