[PATCH 4.19.y-cip 44/57] ASoC: sh: Avoid passing NULL to memory allocators


Biju Das <biju.das@...>
 

From: Takashi Iwai <tiwai@...>

commit 8f74ae398aa0b96207de366e9a723517e440e590 upstream.

We should pass a proper non-NULL device object to memory allocators
although it was accepted in the past. The card->dev points to the
most appropriate device object in such a case, so let's put it.

Acked-by: Christoph Hellwig <hch@...>
Acked-by: Mark Brown <broonie@...>
Signed-off-by: Takashi Iwai <tiwai@...>
Signed-off-by: Biju Das <biju.das@...>
---
sound/soc/sh/siu_pcm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/sh/siu_pcm.c b/sound/soc/sh/siu_pcm.c
index e263757..23384c4 100644
--- a/sound/soc/sh/siu_pcm.c
+++ b/sound/soc/sh/siu_pcm.c
@@ -542,7 +542,7 @@ static int siu_pcm_new(struct snd_soc_pcm_runtime *rtd)
return ret;

ret = snd_pcm_lib_preallocate_pages_for_all(pcm,
- SNDRV_DMA_TYPE_DEV, NULL,
+ SNDRV_DMA_TYPE_DEV, card->dev,
SIU_BUFFER_BYTES_MAX, SIU_BUFFER_BYTES_MAX);
if (ret < 0) {
dev_err(card->dev,
--
2.7.4

Join cip-dev@lists.cip-project.org to automatically receive all group messages.