summaryrefslogtreecommitdiffstats
path: root/sound/arm
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-02-04 14:26:27 +0100
committerTakashi Iwai <tiwai@suse.de>2019-02-04 16:51:46 +0100
commitbc70a9d70052c45483c2ef6a7fe08638cf88f490 (patch)
tree9f8bf851307dfe6f5716522c5f8ce23c4081c1d9 /sound/arm
parentc7c3fec8a524774dbd1daf7841df1217dd589298 (diff)
downloadlinux-stable-bc70a9d70052c45483c2ef6a7fe08638cf88f490.tar.gz
linux-stable-bc70a9d70052c45483c2ef6a7fe08638cf88f490.tar.bz2
linux-stable-bc70a9d70052c45483c2ef6a7fe08638cf88f490.zip
ALSA: arm: Avoid passing NULL to memory allocators
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@lst.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/arm')
-rw-r--r--sound/arm/aaci.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c
index 0c3f073e2600..a2d4b41096e0 100644
--- a/sound/arm/aaci.c
+++ b/sound/arm/aaci.c
@@ -941,7 +941,8 @@ static int aaci_init_pcm(struct aaci *aaci)
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &aaci_playback_ops);
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &aaci_capture_ops);
snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
- NULL, 0, 64 * 1024);
+ aaci->card->dev,
+ 0, 64 * 1024);
}
return ret;