From: Hans de Goede Date: Fri, 19 Jan 2018 20:47:09 +0000 (+0100) Subject: platform/x86: GPD pocket fan: Stop work on suspend X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e5778689a9653c0f364efbbd6b9bdd0527e7d8cb;p=linux.git platform/x86: GPD pocket fan: Stop work on suspend Stop the work on suspend, otherwise it may run between our suspend method running and the system suspending, possibly restarting the fan which we've just stopped. Note we already requeue the work on resume, so that we get a fresh speed at resume. Signed-off-by: Hans de Goede Signed-off-by: Andy Shevchenko --- diff --git a/drivers/platform/x86/gpd-pocket-fan.c b/drivers/platform/x86/gpd-pocket-fan.c index 2652eb40e5bca..2d645c505f819 100644 --- a/drivers/platform/x86/gpd-pocket-fan.c +++ b/drivers/platform/x86/gpd-pocket-fan.c @@ -177,6 +177,7 @@ static int gpd_pocket_fan_suspend(struct device *dev) { struct gpd_pocket_fan_data *fan = dev_get_drvdata(dev); + cancel_delayed_work_sync(&fan->work); gpd_pocket_fan_set_speed(fan, gpd_pocket_fan_min_speed()); return 0; }