diff options
| author |   Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2014-12-09 21:14:37 +0800 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2014-12-15 18:21:40 +0000 |
| commit | f5d40b400fe2de5f9dc3d41681cc59b2b7c28f8c (patch) | |
| tree | 2030f53a4c8ccd0085d24d9264942d0f7ada66c9 /sound | |
| parent | Merge remote-tracking branches 'asoc/topic/wm9090', 'asoc/topic/wm9712' and 'asoc/topic/wm9713' into asoc-next (diff) | |
| download | linux-dev-f5d40b400fe2de5f9dc3d41681cc59b2b7c28f8c.tar.xz linux-dev-f5d40b400fe2de5f9dc3d41681cc59b2b7c28f8c.zip | |
ASoC: Intel: fix return value check in sst_acpi_probe()
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>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/intel/sst/sst_acpi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/intel/sst/sst_acpi.c b/sound/soc/intel/sst/sst_acpi.c index 31124aa4434e..f59972a28d24 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); |