diff options
author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2014-12-09 08:14:37 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-12-15 13:21:40 -0500 |
commit | f5d40b400fe2de5f9dc3d41681cc59b2b7c28f8c (patch) | |
tree | 2030f53a4c8ccd0085d24d9264942d0f7ada66c9 | |
parent | 1810afd3e1ded09c53d4e966dddce3c7d484521f (diff) |
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>
-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) | |||
277 | dev_dbg(dev, "ACPI device id: %x\n", dev_id); | 277 | dev_dbg(dev, "ACPI device id: %x\n", dev_id); |
278 | 278 | ||
279 | plat_dev = platform_device_register_data(dev, mach->pdata->platform, -1, NULL, 0); | 279 | plat_dev = platform_device_register_data(dev, mach->pdata->platform, -1, NULL, 0); |
280 | if (plat_dev == NULL) { | 280 | if (IS_ERR(plat_dev)) { |
281 | dev_err(dev, "Failed to create machine device: %s\n", mach->pdata->platform); | 281 | dev_err(dev, "Failed to create machine device: %s\n", mach->pdata->platform); |
282 | return -ENODEV; | 282 | return PTR_ERR(plat_dev); |
283 | } | 283 | } |
284 | 284 | ||
285 | /* Create platform device for sst machine driver */ | 285 | /* Create platform device for sst machine driver */ |
286 | mdev = platform_device_register_data(dev, mach->machine, -1, NULL, 0); | 286 | mdev = platform_device_register_data(dev, mach->machine, -1, NULL, 0); |
287 | if (mdev == NULL) { | 287 | if (IS_ERR(mdev)) { |
288 | dev_err(dev, "Failed to create machine device: %s\n", mach->machine); | 288 | dev_err(dev, "Failed to create machine device: %s\n", mach->machine); |
289 | return -ENODEV; | 289 | return PTR_ERR(mdev); |
290 | } | 290 | } |
291 | 291 | ||
292 | ret = sst_alloc_drv_context(&ctx, dev, dev_id); | 292 | ret = sst_alloc_drv_context(&ctx, dev, dev_id); |