projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'asoc/fix/omap' into asoc-linus
[linux-2.6-block.git]
/
sound
/
soc
/
omap
/
omap-hdmi-audio.c
diff --git
a/sound/soc/omap/omap-hdmi-audio.c
b/sound/soc/omap/omap-hdmi-audio.c
index ccfb41c22e53b11cedbf5d8272a56a757ad283d1..f7eb42aa3f3893ca7cfd76fd2f8a96ff986d68b2 100644
(file)
--- a/
sound/soc/omap/omap-hdmi-audio.c
+++ b/
sound/soc/omap/omap-hdmi-audio.c
@@
-352,6
+352,9
@@
static int omap_hdmi_audio_probe(struct platform_device *pdev)
return ret;
card = devm_kzalloc(dev, sizeof(*card), GFP_KERNEL);
+ if (!card)
+ return -ENOMEM;
+
card->name = devm_kasprintf(dev, GFP_KERNEL,
"HDMI %s", dev_name(ad->dssdev));
card->owner = THIS_MODULE;