summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2008-03-04 14:29:19 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-03-04 16:35:16 -0800
commit022d917d9621ee79e6f6782fbddd582b8f941024 (patch)
tree079bd376406c4618782e5b9ff2f0d1ff7f50bc3f
parentae91d60ba88ef0bdb1b5e9b2363bd52fc45d2af7 (diff)
downloadlinux-3.10-022d917d9621ee79e6f6782fbddd582b8f941024.tar.gz
linux-3.10-022d917d9621ee79e6f6782fbddd582b8f941024.tar.bz2
linux-3.10-022d917d9621ee79e6f6782fbddd582b8f941024.zip
drivers/serial/m32r_sio.c: correct use of ! and &
In commit e6bafba5b4765a5a252f1b8d31cbf6d2459da337 ("wmi: (!x & y) strikes again"), a bug was fixed that involved converting !x & y to !(x & y). The code below shows the same pattern, and thus should perhaps be fixed in the same way. This is not tested and clearly changes the semantics, so it is only something to consider. The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // <smpl> @@ expression E1,E2; @@ ( !E1 & !E2 | - !E1 & E2 + !(E1 & E2) ) // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Cc: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/serial/m32r_sio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/m32r_sio.c b/drivers/serial/m32r_sio.c
index 348ee2c19b5..c2bb11c02bd 100644
--- a/drivers/serial/m32r_sio.c
+++ b/drivers/serial/m32r_sio.c
@@ -421,7 +421,7 @@ static void transmit_chars(struct uart_sio_port *up)
up->port.icount.tx++;
if (uart_circ_empty(xmit))
break;
- while (!serial_in(up, UART_LSR) & UART_LSR_THRE);
+ while (!(serial_in(up, UART_LSR) & UART_LSR_THRE));
} while (--count > 0);