git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'asoc-4.18' into asoc-4.19 wmadsp dep
[sfrench/cifs-2.6.git]
/
sound
/
soc
/
codecs
/
hdmi-codec.c
diff --git
a/sound/soc/codecs/hdmi-codec.c
b/sound/soc/codecs/hdmi-codec.c
index 3e5b12de71bb26a286827f14acdb63c52d7e6871..d00734d31e0429bf3df8c12b0bcc118ccefb3ec2 100644
(file)
--- a/
sound/soc/codecs/hdmi-codec.c
+++ b/
sound/soc/codecs/hdmi-codec.c
@@
-780,7
+780,7
@@
static int hdmi_codec_probe(struct platform_device *pdev)
hcp->hcd = *hcd;
mutex_init(&hcp->current_stream_lock);
hcp->hcd = *hcd;
mutex_init(&hcp->current_stream_lock);
- hcp->daidrv = devm_k
zalloc(dev, dai_count *
sizeof(*hcp->daidrv),
+ hcp->daidrv = devm_k
calloc(dev, dai_count,
sizeof(*hcp->daidrv),
GFP_KERNEL);
if (!hcp->daidrv)
return -ENOMEM;
GFP_KERNEL);
if (!hcp->daidrv)
return -ENOMEM;