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 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
[pandora-kernel.git]
/
drivers
/
tty
/
hvc
/
hvsi.c
diff --git
a/drivers/tty/hvc/hvsi.c
b/drivers/tty/hvc/hvsi.c
index
0083bc1
..
5b95b4f
100644
(file)
--- a/
drivers/tty/hvc/hvsi.c
+++ b/
drivers/tty/hvc/hvsi.c
@@
-765,7
+765,7
@@
static void hvsi_flush_output(struct hvsi_struct *hp)
/* 'writer' could still be pending if it didn't see n_outbuf = 0 yet */
cancel_delayed_work_sync(&hp->writer);
- flush_work
_sync
(&hp->handshaker);
+ flush_work(&hp->handshaker);
/*
* it's also possible that our timeout expired and hvsi_write_worker