ALSA: x86: fix error return code in hdmi_lpe_audio_probe()

PATCH Superseded Gustavo A. R. Silva 2 participants 8 messages Jun 30, 2017 Sound

Share & tools

Gustavo A. R. Silva

author

2017-06-30 19:59 UTC #0 lore raw

PATCH 1/1 ALSA: x86: fix error return code in hdmi_lpe_audio_probe()

platform_get_irq() returns an error code, but the sata_rcar driver ignores it and always returns -ENODEV. This is not correct, and prevents -EPROBE_DEFER from being propagated properly. Also, notice that platform_get_irq() no longer returns 0 on error.

Print and propagate the return value of platform_get_irq on failure.

Signed-off-by Gustavo A. R. Silva <[email protected]>

---
 sound/x86/intel_hdmi_audio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

sound/x86/intel_hdmi_audio.c +2 -2

index c19efc9..a095150 100644
@@ -1758,8 +1758,8 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev)
 	/* get resources */
 	irq = platform_get_irq(pdev, 0);
 	if (irq < 0) {
-		dev_err(&pdev->dev, "Could not get irq resource\n");
-		return -ENODEV;
+		dev_err(&pdev->dev, "Could not get irq resource: %d\n", irq);
+		return irq;
 	}
 
 	res_mmio = platform_get_resource(pdev, IORESOURCE_MEM, 0);

Signature · 1 line

2.5.0

Takashi Iwai

2017-06-30 20:07 UTC #1 lore raw

Quoted 3 lines · Gustavo A. R. Silva

platform_get_irq() returns an error code, but the sata_rcar driver ignores it and always returns -ENODEV.

Which driver? A copy&paste error?

Takashi

Quoted 30 lines

This is not correct, and
prevents -EPROBE_DEFER from being propagated properly. Also, notice that platform_get_irq() no longer returns 0 on error.
Print and propagate the return value of platform_get_irq on failure.
Signed-off-by Gustavo A. R. Silva <[email protected]>
---
 sound/x86/intel_hdmi_audio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/x86/intel_hdmi_audio.c +2 -2
index c19efc9..a095150 100644
@@ -1758,8 +1758,8 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev)
 	/* get resources */
 	irq = platform_get_irq(pdev, 0);
 	if (irq < 0) {
-		dev_err(&pdev->dev, "Could not get irq resource\n");
-		return -ENODEV;
+		dev_err(&pdev->dev, "Could not get irq resource: %d\n", irq);
+		return irq;
 	}
 
 	res_mmio = platform_get_resource(pdev, IORESOURCE_MEM, 0);
Signature · 1 line
2.5.0

Gustavo A. R. Silva

author

2017-06-30 20:12 UTC #2 lore raw

Hi Takashi,

Quoting Takashi Iwai <[email protected]>:

Quoted 8 lines

Quoted 3 lines · Gustavo A. R. Silva
platform_get_irq() returns an error code, but the sata_rcar driver ignores it and always returns -ENODEV.
Which driver? A copy&paste error?

Yep, I'm already working on v2 of this patch, which fix this error. I'll send it shortly.

Thanks
--
Gustavo A. R. Silva

Gustavo A. R. Silva

author

2017-06-30 20:18 UTC #3 lore raw

PATCH v2 1/1 ALSA: x86: fix error return code in hdmi_lpe_audio_probe()

platform_get_irq() returns an error code, but the intel_hdmi_audio driver ignores it and always returns -ENODEV. This is not correct, and prevents -EPROBE_DEFER from being propagated properly. Also, notice that platform_get_irq() no longer returns 0 on error.

Print error message and propagate the return value of platform_get_irq on failure.

Signed-off-by Gustavo A. R. Silva <[email protected]>

---
Changes in v2:
Fix error in commit message.

 sound/x86/intel_hdmi_audio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

sound/x86/intel_hdmi_audio.c +2 -2

index c19efc9..a095150 100644
@@ -1758,8 +1758,8 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev)
 	/* get resources */
 	irq = platform_get_irq(pdev, 0);
 	if (irq < 0) {
-		dev_err(&pdev->dev, "Could not get irq resource\n");
-		return -ENODEV;
+		dev_err(&pdev->dev, "Could not get irq resource: %d\n", irq);
+		return irq;
 	}
 
 	res_mmio = platform_get_resource(pdev, IORESOURCE_MEM, 0);

Signature · 1 line

2.5.0

Takashi Iwai

2017-06-30 20:27 UTC #4 lore raw

Quoted 3 lines · Gustavo A. R. Silva

Also,
notice that platform_get_irq() no longer returns 0 on error.

There is no change by your patch in this regard, right?

Takashi

Quoted 30 lines

Print error message and propagate the return value of platform_get_irq on failure.

Signed-off-by Gustavo A. R. Silva <[email protected]>

---
Changes in v2:
Fix error in commit message.

 sound/x86/intel_hdmi_audio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

sound/x86/intel_hdmi_audio.c +2 -2

index c19efc9..a095150 100644
@@ -1758,8 +1758,8 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev)
 	/* get resources */
 	irq = platform_get_irq(pdev, 0);
 	if (irq < 0) {
-		dev_err(&pdev->dev, "Could not get irq resource\n");
-		return -ENODEV;
+		dev_err(&pdev->dev, "Could not get irq resource: %d\n", irq);
+		return irq;
 	}
 
 	res_mmio = platform_get_resource(pdev, IORESOURCE_MEM, 0);

Signature · 1 line

2.5.0

Gustavo A. R. Silva

author

2017-06-30 20:31 UTC #5 lore raw

Hi Takashi,

Quoting Takashi Iwai <[email protected]>:

Quoted 8 lines

Quoted 3 lines · Gustavo A. R. Silva
Also,
notice that platform_get_irq() no longer returns 0 on error.
There is no change by your patch in this regard, right?

You are correct. I just pointing it out. This is the commit that changed the platform_get_irq code:

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e330b9a6bb35dc7097a4f02cb1ae7b6f96df92af

Quoted 29 lines

Takashi
Quoted 26 lines
Print error message and propagate the return value of platform_get_irq on failure.
Signed-off-by Gustavo A. R. Silva <[email protected]>
---
Changes in v2:
Fix error in commit message.
 sound/x86/intel_hdmi_audio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/x86/intel_hdmi_audio.c +2 -2
index c19efc9..a095150 100644
@@ -1758,8 +1758,8 @@ static int hdmi_lpe_audio_probe(struct  
 platform_device *pdev)
 	/* get resources */
 	irq = platform_get_irq(pdev, 0);
 	if (irq < 0) {
-		dev_err(&pdev->dev, "Could not get irq resource\n");
-		return -ENODEV;
+		dev_err(&pdev->dev, "Could not get irq resource: %d\n", irq);
+		return irq;
 	}
 

Quoted 5 lines

Quoted 5 lines
res_mmio = platform_get_resource(pdev, IORESOURCE_MEM, 0);
--
2.5.0

Thanks
--
Gustavo A. R. Silva

Takashi Iwai

2017-06-30 20:39 UTC #6 lore raw

Quoted 11 lines · Gustavo A. R. Silva

Hi Takashi,
Quoting Takashi Iwai <[email protected]>:
Quoted 6 lines
Quoted 3 lines · Gustavo A. R. Silva
Also,
notice that platform_get_irq() no longer returns 0 on error.

Quoted 7 lines

Quoted 2 lines
There is no change by your patch in this regard, right?
You are correct. I just pointing it out. This is the commit that changed the platform_get_irq code:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e330b9a6bb35dc7097a4f02cb1ae7b6f96df92af

OK, applied now to for-next branch.
Thanks.

Takashi

Gustavo A. R. Silva

author

2017-06-30 20:41 UTC #7 lore raw

Quoting Takashi Iwai <[email protected]>:

Quoted 16 lines

Quoted 14 lines · Gustavo A. R. Silva
Hi Takashi,
Quoting Takashi Iwai <[email protected]>:
Quoted 8 lines
Quoted 3 lines · Gustavo A. R. Silva
Also,
notice that platform_get_irq() no longer returns 0 on error.
There is no change by your patch in this regard, right?

Quoted 8 lines

Quoted 4 lines
You are correct. I just pointing it out. This is the commit that changed the platform_get_irq code:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e330b9a6bb35dc7097a4f02cb1ae7b6f96df92af
OK, applied now to for-next branch.
Thanks.

Great :)

Thank you
--
Gustavo A. R. Silva