Merge remote-tracking branch 'asoc/fix/omap' into asoc-linus

diff --combined sound/soc/omap/omap-hdmi-audio.c
index ccfb41c22e53b11cedbf5d8272a56a757ad283d1,069ad451d05d9c5b6bb0075adc3136728e014e8d..f7eb42aa3f3893ca7cfd76fd2f8a96ff986d68b2
--- 1/sound/soc/omap/omap-hdmi-audio.c
--- 2/sound/soc/omap/omap-hdmi-audio.c
+++ b/sound/soc/omap/omap-hdmi-audio.c
@@@ -352,6 -352,9 +352,9 @@@ static int omap_hdmi_audio_probe(struc
                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;
@@@ -393,6 -396,7 +396,6 @@@ static int omap_hdmi_audio_remove(struc
  static struct platform_driver hdmi_audio_driver = {
        .driver = {
                .name = DRV_NAME,
 -              .owner = THIS_MODULE,
        },
        .probe = omap_hdmi_audio_probe,
        .remove = omap_hdmi_audio_remove,