summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTang Bin <tangbin@cmss.chinamobile.com>2020-05-06 22:30:09 +0800
committerMark Brown <broonie@kernel.org>2020-05-06 17:21:22 +0100
commitadb69968074a22376074aaa7f7971d93636b4332 (patch)
treea3bdb93d860eb5e977a66cf377804ca8a6e64f0b
parent4ff028f6c1087bcaf1ee970d4ef43730ed0aaa8c (diff)
downloadlinux-stable-adb69968074a22376074aaa7f7971d93636b4332.tar.gz
linux-stable-adb69968074a22376074aaa7f7971d93636b4332.tar.bz2
linux-stable-adb69968074a22376074aaa7f7971d93636b4332.zip
ASoC: mediatek: Fix error handling
If the function platform_get_irq() failed, the negative value returned will not be detected here. So fix error handling in mt6797_afe_pcm_dev_probe(). And when get irq failed, the function platform_get_irq() logs an error message, so remove redundant message here. Signed-off-by: Zhang Shengju <zhangshengju@cmss.chinamobile.com> Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com> Link: https://lore.kernel.org/r/20200506143009.13368-1-tangbin@cmss.chinamobile.com Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/mediatek/mt6797/mt6797-afe-pcm.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/mediatek/mt6797/mt6797-afe-pcm.c b/sound/soc/mediatek/mt6797/mt6797-afe-pcm.c
index 7f930556d961..7f3ac04b9425 100644
--- a/sound/soc/mediatek/mt6797/mt6797-afe-pcm.c
+++ b/sound/soc/mediatek/mt6797/mt6797-afe-pcm.c
@@ -807,10 +807,9 @@ static int mt6797_afe_pcm_dev_probe(struct platform_device *pdev)
/* request irq */
irq_id = platform_get_irq(pdev, 0);
- if (!irq_id) {
- dev_err(dev, "%pOFn no irq found\n", dev->of_node);
- return -ENXIO;
- }
+ if (irq_id < 0)
+ return irq_id;
+
ret = devm_request_irq(dev, irq_id, mt6797_afe_irq_handler,
IRQF_TRIGGER_NONE, "asys-isr", (void *)afe);
if (ret) {