Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
[linux-3.10.git] / drivers / tty / serial / omap-serial.c
index ccc2f35..6ede6fd 100644 (file)
@@ -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;
 }