]> git.itanic.dy.fi Git - linux-stable/commitdiff
staging: olpc_dcon: Replace flush_scheduled_work() with flush_work().
authorTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Fri, 10 Jun 2022 10:08:43 +0000 (19:08 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Jun 2022 12:47:45 +0000 (14:47 +0200)
Since "struct dcon_priv" is per a device struct, I assume that
dcon_set_source_sync() needs to wait for only one work associated with
that device. Therefore, wait for only that work using flush_work().

Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Link: https://lore.kernel.org/r/a973969d-cfd0-adc8-2651-d299199dbd7b@I-love.SAKURA.ne.jp
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/olpc_dcon/olpc_dcon.c

index b9d570e9ad3b7cc48c61fbf1d5eae6ac02b51b11..9363c5cfe50f6773e4b5f7ae27dd968bce607bf3 100644 (file)
@@ -383,7 +383,7 @@ static void dcon_set_source(struct dcon_priv *dcon, int arg)
 static void dcon_set_source_sync(struct dcon_priv *dcon, int arg)
 {
        dcon_set_source(dcon, arg);
-       flush_scheduled_work();
+       flush_work(&dcon->switch_source);
 }
 
 static ssize_t dcon_mode_show(struct device *dev,