Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes

[~andy/linux] / drivers / input / touchscreen / wm831x-ts.c

diff --git a/drivers/input/touchscreen/wm831x-ts.c b/drivers/input/touchscreen/wm831x-ts.c
index 362f78d4507f59add7b4bafd56450695a5addf52..c7eee56d0087e395f37e27b3f59a4e9c940bf56f 100644 (file)
--- a/drivers/input/touchscreen/wm831x-ts.c
+++ b/drivers/input/touchscreen/wm831x-ts.c
@@ -221,7 +221,7 @@ static void wm831x_ts_input_close(struct input_dev *idev)
        synchronize_irq(wm831x_ts->pd_irq);
 
        /* Make sure the IRQ completion work is quiesced */
-       flush_work_sync(&wm831x_ts->pd_data_work);
+       flush_work(&wm831x_ts->pd_data_work);
 
        /* If we ended up with the pen down then make sure we revert back
         * to pen detection state for the next time we start up.