ASoC: SOF: imx8: Fix an is IS_ERR() vs NULL check

The device_link_add() function only returns NULL on error, it doesn't return error pointers.

---
 sound/soc/sof/imx/imx8.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

index e502f584207f..41ad3a310808 100644
@@ -227,8 +227,8 @@ static int imx8_probe(struct snd_sof_dev *sdev)
 						DL_FLAG_STATELESS |
 						DL_FLAG_PM_RUNTIME |
 						DL_FLAG_RPM_ACTIVE);
-		if (IS_ERR(priv->link[i])) {
-			ret = PTR_ERR(priv->link[i]);
+		if (!priv->link[i]) {
+			ret = -ENOMEM;
 			dev_pm_domain_detach(priv->pd_dev[i], false);
 			goto exit_unroll_pm;
 		}

2.20.1

T24gTW9uLCAyMDE5LTA4LTI2IGF0IDE2OjE4ICswMzAwLCBEYW4gQ2FycGVudGVyIHdyb3RlOg0K PiBUaGUgZGV2aWNlX2xpbmtfYWRkKCkgZnVuY3Rpb24gb25seSByZXR1cm5zIE5VTEwgb24gZXJy b3IsIGl0IGRvZXNuJ3QNCj4gcmV0dXJuIGVycm9yIHBvaW50ZXJzLg0KPiANCj4gRml4ZXM6IDIw MmFjYzU2NWExZiAoIkFTb0M6IFNPRjogaW14OiBBZGQgaS5NWDggSFcgc3VwcG9ydCIpDQo+IFNp Z25lZC1vZmYtYnk6IERhbiBDYXJwZW50ZXIgPGRhbi5jYXJwZW50ZXJAb3JhY2xlLmNvbT4NCg0K VGhhbmtzIERhbiEgTmljZSBjYXRjaC4NCg0KUmV2aWV3ZWQtYnk6IERhbmllbCBCYWx1dGEgPGRh bmllbC5iYWx1dGFAbnhwLmNvbT4NCg0KPiAtLS0NCj4gIHNvdW5kL3NvYy9zb2YvaW14L2lteDgu YyB8IDQgKystLQ0KPiAgMSBmaWxlIGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlv bnMoLSkNCj4gDQo+IGRpZmYgLS1naXQgYS9zb3VuZC9zb2Mvc29mL2lteC9pbXg4LmMgYi9zb3Vu ZC9zb2Mvc29mL2lteC9pbXg4LmMNCj4gaW5kZXggZTUwMmY1ODQyMDdmLi40MWFkM2EzMTA4MDgg MTAwNjQ0DQo+IC0tLSBhL3NvdW5kL3NvYy9zb2YvaW14L2lteDguYw0KPiArKysgYi9zb3VuZC9z b2Mvc29mL2lteC9pbXg4LmMNCj4gQEAgLTIyNyw4ICsyMjcsOCBAQCBzdGF0aWMgaW50IGlteDhf cHJvYmUoc3RydWN0IHNuZF9zb2ZfZGV2ICpzZGV2KQ0KPiAgCQkJCQkJRExfRkxBR19TVEFURUxF U1MgfA0KPiAgCQkJCQkJRExfRkxBR19QTV9SVU5USU1FIHwNCj4gIAkJCQkJCURMX0ZMQUdfUlBN X0FDVElWRSk7DQo+IC0JCWlmIChJU19FUlIocHJpdi0+bGlua1tpXSkpIHsNCj4gLQkJCXJldCA9 IFBUUl9FUlIocHJpdi0+bGlua1tpXSk7DQo+ICsJCWlmICghcHJpdi0+bGlua1tpXSkgew0KPiAr CQkJcmV0ID0gLUVOT01FTTsNCj4gIAkJCWRldl9wbV9kb21haW5fZGV0YWNoKHByaXYtPnBkX2Rl dltpXSwgZmFsc2UpOw0KPiAgCQkJZ290byBleGl0X3Vucm9sbF9wbTsNCj4gIAkJfQ0K

The patch

ASoC: SOF: imx8: Fix an is IS_ERR() vs NULL check

has been applied to the asoc tree at

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.4

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

From a325c7bc3a92f1d5ba8cff10d7ab93a989cdeb80 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <[email protected]>
Date: Mon, 26 Aug 2019 16:18:55 +0300
Subject: [PATCH] ASoC: SOF: imx8: Fix an is IS_ERR() vs NULL check

The device_link_add() function only returns NULL on error, it doesn't return error pointers.

---
 sound/soc/sof/imx/imx8.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

index c9d849ced54a..2a22b18e5ec0 100644
@@ -227,8 +227,8 @@ static int imx8_probe(struct snd_sof_dev *sdev)
 						DL_FLAG_STATELESS |
 						DL_FLAG_PM_RUNTIME |
 						DL_FLAG_RPM_ACTIVE);
-		if (IS_ERR(priv->link[i])) {
-			ret = PTR_ERR(priv->link[i]);
+		if (!priv->link[i]) {
+			ret = -ENOMEM;
 			dev_pm_domain_detach(priv->pd_dev[i], false);
 			goto exit_unroll_pm;
 		}

2.20.1