diff options
-rw-r--r-- | sound/x86/intel_hdmi_audio.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c index dd3baabd1e82..360cff35b239 100644 --- a/sound/x86/intel_hdmi_audio.c +++ b/sound/x86/intel_hdmi_audio.c | |||
@@ -1054,13 +1054,6 @@ static int had_pcm_open(struct snd_pcm_substream *substream) | |||
1054 | 1054 | ||
1055 | pm_runtime_get_sync(intelhaddata->dev); | 1055 | pm_runtime_get_sync(intelhaddata->dev); |
1056 | 1056 | ||
1057 | if (!intelhaddata->connected) { | ||
1058 | dev_dbg(intelhaddata->dev, "%s: HDMI cable plugged-out\n", | ||
1059 | __func__); | ||
1060 | retval = -ENODEV; | ||
1061 | goto error; | ||
1062 | } | ||
1063 | |||
1064 | /* set the runtime hw parameter with local snd_pcm_hardware struct */ | 1057 | /* set the runtime hw parameter with local snd_pcm_hardware struct */ |
1065 | runtime->hw = had_pcm_hardware; | 1058 | runtime->hw = had_pcm_hardware; |
1066 | 1059 | ||
@@ -1186,14 +1179,6 @@ static int had_pcm_trigger(struct snd_pcm_substream *substream, int cmd) | |||
1186 | case SNDRV_PCM_TRIGGER_START: | 1179 | case SNDRV_PCM_TRIGGER_START: |
1187 | case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: | 1180 | case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: |
1188 | case SNDRV_PCM_TRIGGER_RESUME: | 1181 | case SNDRV_PCM_TRIGGER_RESUME: |
1189 | /* Disable local INTRs till register prgmng is done */ | ||
1190 | if (!intelhaddata->connected) { | ||
1191 | dev_dbg(intelhaddata->dev, | ||
1192 | "_START: HDMI cable plugged-out\n"); | ||
1193 | retval = -ENODEV; | ||
1194 | break; | ||
1195 | } | ||
1196 | |||
1197 | /* Enable Audio */ | 1182 | /* Enable Audio */ |
1198 | had_ack_irqs(intelhaddata); /* FIXME: do we need this? */ | 1183 | had_ack_irqs(intelhaddata); /* FIXME: do we need this? */ |
1199 | had_enable_audio(intelhaddata, true); | 1184 | had_enable_audio(intelhaddata, true); |
@@ -1227,13 +1212,6 @@ static int had_pcm_prepare(struct snd_pcm_substream *substream) | |||
1227 | intelhaddata = snd_pcm_substream_chip(substream); | 1212 | intelhaddata = snd_pcm_substream_chip(substream); |
1228 | runtime = substream->runtime; | 1213 | runtime = substream->runtime; |
1229 | 1214 | ||
1230 | if (!intelhaddata->connected) { | ||
1231 | dev_dbg(intelhaddata->dev, "%s: HDMI cable plugged-out\n", | ||
1232 | __func__); | ||
1233 | retval = -ENODEV; | ||
1234 | goto prep_end; | ||
1235 | } | ||
1236 | |||
1237 | dev_dbg(intelhaddata->dev, "period_size=%d\n", | 1215 | dev_dbg(intelhaddata->dev, "period_size=%d\n", |
1238 | (int)frames_to_bytes(runtime, runtime->period_size)); | 1216 | (int)frames_to_bytes(runtime, runtime->period_size)); |
1239 | dev_dbg(intelhaddata->dev, "periods=%d\n", runtime->periods); | 1217 | dev_dbg(intelhaddata->dev, "periods=%d\n", runtime->periods); |