From: jsg Date: Fri, 12 May 2023 11:09:03 +0000 (+0000) Subject: drm/probe-helper: Cancel previous job before starting new one X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=c7da2993da5a2caa973422b49175ce95d27f4df6;p=openbsd drm/probe-helper: Cancel previous job before starting new one From Dom Cobley 809a3fb8d8fce5801300ead8aaf52a4ee102e0db in linux-6.1.y/6.1.28 a8e47884f1906cd7440fafa056adc8817568e73e in mainline linux --- diff --git a/sys/dev/pci/drm/drm_probe_helper.c b/sys/dev/pci/drm/drm_probe_helper.c index 041c7f59628..4de1e512242 100644 --- a/sys/dev/pci/drm/drm_probe_helper.c +++ b/sys/dev/pci/drm/drm_probe_helper.c @@ -557,8 +557,9 @@ retry: */ dev->mode_config.delayed_event = true; if (dev->mode_config.poll_enabled) - schedule_delayed_work(&dev->mode_config.output_poll_work, - 0); + mod_delayed_work(system_wq, + &dev->mode_config.output_poll_work, + 0); } /* Re-enable polling in case the global poll config changed. */