Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / tty / hvc / hvsi.c

diff --git a/drivers/char/hvsi.c b/drivers/tty/hvc/hvsi.c
similarity index 99%
rename from drivers/char/hvsi.c
rename to drivers/tty/hvc/hvsi.c
index a2bc885ce60a8e2bab93a815ab6ffc7d86640220..67a75a502c01f54034c6c050b1be6ae3103fc75f 100644 (file)
--- a/drivers/char/hvsi.c
+++ b/drivers/tty/hvc/hvsi.c
@@ -850,8 +850,8 @@ static void hvsi_flush_output(struct hvsi_struct *hp)
        wait_event_timeout(hp->emptyq, (hp->n_outbuf <= 0), HVSI_TIMEOUT);
 
        /* 'writer' could still be pending if it didn't see n_outbuf = 0 yet */
-       cancel_delayed_work(&hp->writer);
-       flush_scheduled_work();
+       cancel_delayed_work_sync(&hp->writer);
+       flush_work_sync(&hp->handshaker);
 
        /*
         * it's also possible that our timeout expired and hvsi_write_worker