* [PATCH -next] ASoC: Intel: fix return value check in sst_acpi_probe()
@ 2014-12-09 13:14 weiyj_lk
2014-12-15 18:21 ` Mark Brown
0 siblings, 1 reply; 2+ messages in thread
From: weiyj_lk @ 2014-12-09 13:14 UTC (permalink / raw)
To: Liam Girdwood, Mark Brown, Jaroslav Kysela, Takashi Iwai,
Vinod Koul, kbuild test robot, Mengdong Lin, Subhransu S. Prusty
Cc: Wei Yongjun, alsa-devel, linux-kernel
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
In case of error, the function 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().
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
sound/soc/intel/sst/sst_acpi.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sound/soc/intel/sst/sst_acpi.c b/sound/soc/intel/sst/sst_acpi.c
index 31124aa..f59972a 100644
--- a/sound/soc/intel/sst/sst_acpi.c
+++ b/sound/soc/intel/sst/sst_acpi.c
@@ -277,16 +277,16 @@ int sst_acpi_probe(struct platform_device *pdev)
dev_dbg(dev, "ACPI device id: %x\n", dev_id);
plat_dev = platform_device_register_data(dev, mach->pdata->platform, -1, NULL, 0);
- if (plat_dev == NULL) {
+ if (IS_ERR(plat_dev)) {
dev_err(dev, "Failed to create machine device: %s\n", mach->pdata->platform);
- return -ENODEV;
+ return PTR_ERR(plat_dev);
}
/* Create platform device for sst machine driver */
mdev = platform_device_register_data(dev, mach->machine, -1, NULL, 0);
- if (mdev == NULL) {
+ if (IS_ERR(mdev)) {
dev_err(dev, "Failed to create machine device: %s\n", mach->machine);
- return -ENODEV;
+ return PTR_ERR(mdev);
}
ret = sst_alloc_drv_context(&ctx, dev, dev_id);
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH -next] ASoC: Intel: fix return value check in sst_acpi_probe()
2014-12-09 13:14 [PATCH -next] ASoC: Intel: fix return value check in sst_acpi_probe() weiyj_lk
@ 2014-12-15 18:21 ` Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2014-12-15 18:21 UTC (permalink / raw)
To: weiyj_lk
Cc: Liam Girdwood, Jaroslav Kysela, Takashi Iwai, Vinod Koul,
kbuild test robot, Mengdong Lin, Subhransu S. Prusty,
Wei Yongjun, alsa-devel, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 332 bytes --]
On Tue, Dec 09, 2014 at 09:14:37PM +0800, weiyj_lk@163.com wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> In case of error, the function 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().
Applied, thanks.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-12-15 18:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-12-09 13:14 [PATCH -next] ASoC: Intel: fix return value check in sst_acpi_probe() weiyj_lk
2014-12-15 18:21 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®