summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorYang Yingliang <yangyingliang@huawei.com>2021-10-27 14:52:28 +0800
committerMark Brown <broonie@kernel.org>2021-10-27 11:31:24 +0100
commitfdde18b9773636cc5866ccd8f2093e1cf0022dea (patch)
tree92f8a3d35834f5c007161d4592fa5874ee871dd7 /sound
parentf88ee76b8645c6da37eec79cfd45f2cc646bd01a (diff)
downloadlinux-stable-fdde18b9773636cc5866ccd8f2093e1cf0022dea.tar.gz
linux-stable-fdde18b9773636cc5866ccd8f2093e1cf0022dea.tar.bz2
linux-stable-fdde18b9773636cc5866ccd8f2093e1cf0022dea.zip
ASoC: amd: acp: Fix return value check in acp_machine_select()
In case of error, platform_device_register_data() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Reported-by: Hulk Robot <hulkci@huawei.com> Fixes: e646b51f5dd5 ("ASoC: amd: acp: Add callback for machine driver on ACP") Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Link: https://lore.kernel.org/r/20211027065228.833825-1-yangyingliang@huawei.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/amd/acp/acp-platform.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/amd/acp/acp-platform.c b/sound/soc/amd/acp/acp-platform.c
index 75003d0a41e3..65a809e2c29f 100644
--- a/sound/soc/amd/acp/acp-platform.c
+++ b/sound/soc/amd/acp/acp-platform.c
@@ -81,7 +81,7 @@ int acp_machine_select(struct acp_dev_data *adata)
adata->mach_dev = platform_device_register_data(adata->dev, mach->drv_name,
PLATFORM_DEVID_NONE, mach, size);
- if (!adata->mach_dev)
+ if (IS_ERR(adata->mach_dev))
dev_warn(adata->dev, "Unable to register Machine device\n");
return 0;