diff options
author | Gustavo A. R. Silva <garsilva@embeddedor.com> | 2017-06-30 16:18:41 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2017-06-30 16:38:18 -0400 |
commit | 1967158fff819b38f4e46763ca8df067b4b69f59 (patch) | |
tree | 5528434bb1a8e79ee67fa85a2244b0a74b6fc315 /sound/x86 | |
parent | 0a6f0600efc3df0179a33188c30b5026bd9d1c27 (diff) |
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 <garsilva@embeddedor.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/x86')
-rw-r--r-- | sound/x86/intel_hdmi_audio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c index b11d3920b9a5..37f06ffdf1e6 100644 --- a/sound/x86/intel_hdmi_audio.c +++ b/sound/x86/intel_hdmi_audio.c | |||
@@ -1699,8 +1699,8 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev) | |||
1699 | /* get resources */ | 1699 | /* get resources */ |
1700 | irq = platform_get_irq(pdev, 0); | 1700 | irq = platform_get_irq(pdev, 0); |
1701 | if (irq < 0) { | 1701 | if (irq < 0) { |
1702 | dev_err(&pdev->dev, "Could not get irq resource\n"); | 1702 | dev_err(&pdev->dev, "Could not get irq resource: %d\n", irq); |
1703 | return -ENODEV; | 1703 | return irq; |
1704 | } | 1704 | } |
1705 | 1705 | ||
1706 | res_mmio = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 1706 | res_mmio = platform_get_resource(pdev, IORESOURCE_MEM, 0); |