* [PATCH v2] ALSA: intel_hdmi: Check for error num after setting mask
@ 2022-01-06 9:44 Jiasheng Jiang
2022-01-06 14:58 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Jiasheng Jiang @ 2022-01-06 9:44 UTC (permalink / raw)
To: tiwai
Cc: perex, tiwai, leon, broonie, joe, alsa-devel, linux-kernel,
Jiasheng Jiang
To maintain the consistency of the code, it should be better to add the
sanity check after calling dma_set_mask_and_coherent(), like
tegra_pcm_dma_allocate() in `sound/soc/tegra/tegra_pcm.c`.
Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
---
Changelog
v1 -> v2
* Change 1. Remove the fixes tag and change the message.
---
sound/x86/intel_hdmi_audio.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c
index 33b12aa67cf5..6caea517f07f 100644
--- a/sound/x86/intel_hdmi_audio.c
+++ b/sound/x86/intel_hdmi_audio.c
@@ -1770,7 +1770,9 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev)
card_ctx->irq = irq;
/* only 32bit addressable */
- dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
+ ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
+ if (ret)
+ goto err;
init_channel_allocations();
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] ALSA: intel_hdmi: Check for error num after setting mask
2022-01-06 9:44 [PATCH v2] ALSA: intel_hdmi: Check for error num after setting mask Jiasheng Jiang
@ 2022-01-06 14:58 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2022-01-06 14:58 UTC (permalink / raw)
To: Jiasheng Jiang; +Cc: perex, tiwai, leon, broonie, joe, alsa-devel, linux-kernel
On Thu, 06 Jan 2022 10:44:02 +0100,
Jiasheng Jiang wrote:
>
> To maintain the consistency of the code, it should be better to add the
> sanity check after calling dma_set_mask_and_coherent(), like
> tegra_pcm_dma_allocate() in `sound/soc/tegra/tegra_pcm.c`.
>
> Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
> ---
> Changelog
>
> v1 -> v2
>
> * Change 1. Remove the fixes tag and change the message.
> ---
> sound/x86/intel_hdmi_audio.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c
> index 33b12aa67cf5..6caea517f07f 100644
> --- a/sound/x86/intel_hdmi_audio.c
> +++ b/sound/x86/intel_hdmi_audio.c
> @@ -1770,7 +1770,9 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev)
> card_ctx->irq = irq;
>
> /* only 32bit addressable */
> - dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
> + ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
> + if (ret)
> + goto err;
The build fails with the latest code, unfortunately.
This function simply returns an error, as it was changed to a devres
allocation some time ago.
thanks,
Takashi
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-01-06 14:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-06 9:44 [PATCH v2] ALSA: intel_hdmi: Check for error num after setting mask Jiasheng Jiang
2022-01-06 14:58 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).