linux-kernel - [PATCH] ASoC: loongson: Add the correct judgement return

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20240910021104.3400-1-tangbin@cmss.chinamobile.com>
Date: Tue, 10 Sep 2024 10:11:04 +0800
From: Tang Bin <tangbin@...s.chinamobile.com>
To: lgirdwood@...il.com,
	broonie@...nel.org,
	perex@...ex.cz,
	tiwai@...e.com
Cc: linux-sound@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Tang Bin <tangbin@...s.chinamobile.com>
Subject: [PATCH] ASoC: loongson: Add the correct judgement return

Use the function dev_err_probe can simplify code, but
the error return should not be deleted, that is
unreasonable, thus fix it.

Fixes: 3d2528d6c021 ("ASoC: loongson: Simplify with dev_err_probe()")
Signed-off-by: Tang Bin <tangbin@...s.chinamobile.com>
---
 sound/soc/loongson/loongson_card.c    |  6 +++---
 sound/soc/loongson/loongson_i2s_pci.c | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sound/soc/loongson/loongson_card.c b/sound/soc/loongson/loongson_card.c
index 6078cdf09..7379f24d3 100644
--- a/sound/soc/loongson/loongson_card.c
+++ b/sound/soc/loongson/loongson_card.c
@@ -184,16 +184,16 @@ static int loongson_asoc_card_probe(struct platform_device *pdev)
 
 	ret = device_property_read_string(dev, "model", &card->name);
 	if (ret)
-		dev_err_probe(dev, ret, "Error parsing card name\n");
+		return dev_err_probe(dev, ret, "Error parsing card name\n");
 
 	ret = device_property_read_u32(dev, "mclk-fs", &ls_priv->mclk_fs);
 	if (ret)
-		dev_err_probe(dev, ret, "Error parsing mclk-fs\n");
+		return dev_err_probe(dev, ret, "Error parsing mclk-fs\n");
 
 	ret = has_acpi_companion(dev) ? loongson_card_parse_acpi(ls_priv)
 				      : loongson_card_parse_of(ls_priv);
 	if (ret)
-		dev_err_probe(dev, ret, "Error parsing acpi/of properties\n");
+		return dev_err_probe(dev, ret, "Error parsing acpi/of properties\n");
 
 	return devm_snd_soc_register_card(dev, card);
 }
diff --git a/sound/soc/loongson/loongson_i2s_pci.c b/sound/soc/loongson/loongson_i2s_pci.c
index 3872b1d8f..d2d0e5d8c 100644
--- a/sound/soc/loongson/loongson_i2s_pci.c
+++ b/sound/soc/loongson/loongson_i2s_pci.c
@@ -102,7 +102,7 @@ static int loongson_i2s_pci_probe(struct pci_dev *pdev,
 	i2s->regmap = devm_regmap_init_mmio(dev, i2s->reg_base,
 					    &loongson_i2s_regmap_config);
 	if (IS_ERR(i2s->regmap))
-		dev_err_probe(dev, PTR_ERR(i2s->regmap), "regmap_init_mmio failed\n");
+		return dev_err_probe(dev, PTR_ERR(i2s->regmap), "regmap_init_mmio failed\n");
 
 	tx_data = &i2s->tx_dma_data;
 	rx_data = &i2s->rx_dma_data;
@@ -115,15 +115,15 @@ static int loongson_i2s_pci_probe(struct pci_dev *pdev,
 
 	tx_data->irq = fwnode_irq_get_byname(fwnode, "tx");
 	if (tx_data->irq < 0)
-		dev_err_probe(dev, tx_data->irq, "dma tx irq invalid\n");
+		return dev_err_probe(dev, tx_data->irq, "dma tx irq invalid\n");
 
 	rx_data->irq = fwnode_irq_get_byname(fwnode, "rx");
 	if (rx_data->irq < 0)
-		dev_err_probe(dev, rx_data->irq, "dma rx irq invalid\n");
+		return dev_err_probe(dev, rx_data->irq, "dma rx irq invalid\n");
 
 	ret = device_property_read_u32(dev, "clock-frequency", &i2s->clk_rate);
 	if (ret)
-		dev_err_probe(dev, ret, "clock-frequency property invalid\n");
+		return dev_err_probe(dev, ret, "clock-frequency property invalid\n");
 
 	dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64));
 
@@ -135,7 +135,7 @@ static int loongson_i2s_pci_probe(struct pci_dev *pdev,
 	ret = devm_snd_soc_register_component(dev, &loongson_i2s_component,
 					      &loongson_i2s_dai, 1);
 	if (ret)
-		dev_err_probe(dev, ret, "register DAI failed\n");
+		return dev_err_probe(dev, ret, "register DAI failed\n");
 
 	return 0;
 }
-- 
2.33.0