Merge remote-tracking branches 'asoc/topic/omap', 'asoc/topic/qcom', 'asoc/topic...

[sfrench/cifs-2.6.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..4775da4c4db56529bbc0a6bd6be0b7b2a24370f0 100644 (file)
--- a/sound/soc/omap/omap-hdmi-audio.c
+++ b/sound/soc/omap/omap-hdmi-audio.c
@@ -142,8 +142,6 @@ static int hdmi_dai_hw_params(struct snd_pcm_substream *substream,
 
        iec->status[0] |= IEC958_AES0_CON_EMPHASIS_NONE;
 
-       iec->status[0] |= IEC958_AES1_PRO_MODE_NOTID;
-
        iec->status[1] = IEC958_AES1_CON_GENERAL;
 
        iec->status[2] |= IEC958_AES2_CON_SOURCE_UNSPEC;
@@ -352,6 +350,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;