aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_codec.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
-rw-r--r--sound/pci/hda/hda_codec.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 462e2cedaa6a..26d255de6beb 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -3470,10 +3470,16 @@ int snd_hda_multi_out_analog_open(struct hda_codec *codec,
3470 } 3470 }
3471 mutex_lock(&codec->spdif_mutex); 3471 mutex_lock(&codec->spdif_mutex);
3472 if (mout->share_spdif) { 3472 if (mout->share_spdif) {
3473 runtime->hw.rates &= mout->spdif_rates; 3473 if ((runtime->hw.rates & mout->spdif_rates) &&
3474 runtime->hw.formats &= mout->spdif_formats; 3474 (runtime->hw.formats & mout->spdif_formats)) {
3475 if (mout->spdif_maxbps < hinfo->maxbps) 3475 runtime->hw.rates &= mout->spdif_rates;
3476 hinfo->maxbps = mout->spdif_maxbps; 3476 runtime->hw.formats &= mout->spdif_formats;
3477 if (mout->spdif_maxbps < hinfo->maxbps)
3478 hinfo->maxbps = mout->spdif_maxbps;
3479 } else {
3480 mout->share_spdif = 0;
3481 /* FIXME: need notify? */
3482 }
3477 } 3483 }
3478 mutex_unlock(&codec->spdif_mutex); 3484 mutex_unlock(&codec->spdif_mutex);
3479 } 3485 }