diff options
| author | Cezary Rojewski <cezary.rojewski@intel.com> | 2020-10-07 15:57:00 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-10-08 21:16:48 +0100 |
| commit | f38d43dafb0ccd85034fe22647d353ee8be03ab6 (patch) | |
| tree | fba908948447f00b314251827e1a7917704fadfb /sound | |
| parent | 6db282c8a9edcbf84e699e45ec087baf07be2236 (diff) | |
| download | linux-f38d43dafb0ccd85034fe22647d353ee8be03ab6.tar.gz linux-f38d43dafb0ccd85034fe22647d353ee8be03ab6.tar.bz2 linux-f38d43dafb0ccd85034fe22647d353ee8be03ab6.zip | |
ASoC: Intel: catpt: Fix compilation when CONFIG_MODULES is disabled
module_is_live() is available only when CONFIG_MODULES is enabled.
Replace its usage with try_module_get() which is present regardless of
said config's status.
Fixes: 7a10b66a5df9 ("ASoC: Intel: catpt: Device driver lifecycle")
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Link: https://lore.kernel.org/r/20201007135701.20372-1-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/intel/catpt/device.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/soc/intel/catpt/device.c b/sound/soc/intel/catpt/device.c index 390ffb203de0..a70179959795 100644 --- a/sound/soc/intel/catpt/device.c +++ b/sound/soc/intel/catpt/device.c @@ -81,10 +81,11 @@ static int __maybe_unused catpt_resume(struct device *dev) if (ret) return ret; - if (!module_is_live(dev->driver->owner)) { + if (!try_module_get(dev->driver->owner)) { dev_info(dev, "module unloading, skipping fw boot\n"); return 0; } + module_put(dev->driver->owner); ret = catpt_boot_firmware(cdev, true); if (ret) { @@ -107,10 +108,12 @@ static int __maybe_unused catpt_resume(struct device *dev) static int __maybe_unused catpt_runtime_suspend(struct device *dev) { - if (!module_is_live(dev->driver->owner)) { + if (!try_module_get(dev->driver->owner)) { dev_info(dev, "module unloading, skipping suspend\n"); return 0; } + module_put(dev->driver->owner); + return catpt_suspend(dev); } |