projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
serial
/
imx.c
diff --git
a/drivers/serial/imx.c
b/drivers/serial/imx.c
index 18130f11238e6025b16682c9a00cca218727e370..60d665a17a885b280cd98b289dd783a58d9d4ac7 100644
(file)
--- a/
drivers/serial/imx.c
+++ b/
drivers/serial/imx.c
@@
-1088,7
+1088,7
@@
imx_console_get_options(struct imx_port *sport, int *baud,
int *parity, int *bits)
{
- if (
readl(sport->port.membase + UCR1) | UCR1_UARTEN
) {
+ if (
readl(sport->port.membase + UCR1) & UCR1_UARTEN
) {
/* ok, the port was enabled */
unsigned int ucr2, ubir,ubmr, uartclk;
unsigned int baud_raw;