git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
[pandora-kernel.git]
/
drivers
/
serial
/
m32r_sio.c
diff --git
a/drivers/serial/m32r_sio.c
b/drivers/serial/m32r_sio.c
index
c85ac1a
..
7656a35
100644
(file)
--- a/
drivers/serial/m32r_sio.c
+++ b/
drivers/serial/m32r_sio.c
@@
-590,7
+590,7
@@
static void m32r_sio_timeout(unsigned long data)
sts = sio_in(up, SIOSTS);
if (sts & 0x5) {
spin_lock(&up->port.lock);
- m32r_sio_handle_port(up, sts
, NULL
);
+ m32r_sio_handle_port(up, sts);
spin_unlock(&up->port.lock);
}