Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

[karo-tx-linux.git] / drivers / tty / serial / omap-serial.c

diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index ccc2f35adff1dd8c27d86676461e6c094f7e68aa..6ede6fd92b4cd00e939dca479e0f3e3a0a0d923e 100644 (file)
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -1227,7 +1227,7 @@ static int serial_omap_suspend(struct device *dev)
        struct uart_omap_port *up = dev_get_drvdata(dev);
 
        uart_suspend_port(&serial_omap_reg, &up->port);
-       flush_work_sync(&up->qos_work);
+       flush_work(&up->qos_work);
 
        return 0;
 }