diff options
| author | Mark Brown <broonie@kernel.org> | 2015-03-04 20:42:40 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-04 20:42:40 +0000 |
| commit | a9ca2a3cf40b28fd5672cae44c377a4d5c07404f (patch) | |
| tree | 2f1e6b78b2612748696a0b9372b8b596b421675f /sound/soc/omap/omap-hdmi-audio.c | |
| parent | 465de977eeb4f98959caaa480a0323e139d23f3a (diff) | |
| parent | d51199a83a2cf82a291d19ee852c44caa511427d (diff) | |
Merge remote-tracking branch 'asoc/fix/omap' into asoc-linus
Diffstat (limited to 'sound/soc/omap/omap-hdmi-audio.c')
| -rw-r--r-- | sound/soc/omap/omap-hdmi-audio.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/omap/omap-hdmi-audio.c b/sound/soc/omap/omap-hdmi-audio.c index ccfb41c22e53..f7eb42aa3f38 100644 --- 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; |