Merge branch 'fix/hda' into topic/hda
This commit is contained in:
commit
1475ef0f03
|
@ -3467,10 +3467,16 @@ int snd_hda_multi_out_analog_open(struct hda_codec *codec,
|
|||
}
|
||||
mutex_lock(&codec->spdif_mutex);
|
||||
if (mout->share_spdif) {
|
||||
runtime->hw.rates &= mout->spdif_rates;
|
||||
runtime->hw.formats &= mout->spdif_formats;
|
||||
if (mout->spdif_maxbps < hinfo->maxbps)
|
||||
hinfo->maxbps = mout->spdif_maxbps;
|
||||
if ((runtime->hw.rates & mout->spdif_rates) &&
|
||||
(runtime->hw.formats & mout->spdif_formats)) {
|
||||
runtime->hw.rates &= mout->spdif_rates;
|
||||
runtime->hw.formats &= mout->spdif_formats;
|
||||
if (mout->spdif_maxbps < hinfo->maxbps)
|
||||
hinfo->maxbps = mout->spdif_maxbps;
|
||||
} else {
|
||||
mout->share_spdif = 0;
|
||||
/* FIXME: need notify? */
|
||||
}
|
||||
}
|
||||
mutex_unlock(&codec->spdif_mutex);
|
||||
}
|
||||
|
|
|
@ -1469,6 +1469,7 @@ static int azx_pcm_open(struct snd_pcm_substream *substream)
|
|||
mutex_unlock(&chip->open_mutex);
|
||||
return err;
|
||||
}
|
||||
snd_pcm_limit_hw_rates(runtime);
|
||||
spin_lock_irqsave(&chip->reg_lock, flags);
|
||||
azx_dev->substream = substream;
|
||||
azx_dev->running = 0;
|
||||
|
@ -1478,6 +1479,12 @@ static int azx_pcm_open(struct snd_pcm_substream *substream)
|
|||
snd_pcm_set_sync(substream);
|
||||
mutex_unlock(&chip->open_mutex);
|
||||
|
||||
if (snd_BUG_ON(!runtime->hw.channels_min || !runtime->hw.channels_max))
|
||||
return -EINVAL;
|
||||
if (snd_BUG_ON(!runtime->hw.formats))
|
||||
return -EINVAL;
|
||||
if (snd_BUG_ON(!runtime->hw.rates))
|
||||
return -EINVAL;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -1590,8 +1590,6 @@ static struct snd_pci_quirk stac9200_cfg_tbl[] = {
|
|||
/* SigmaTel reference board */
|
||||
SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
|
||||
"DFI LanParty", STAC_REF),
|
||||
SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0xfb30,
|
||||
"SigmaTel",STAC_9205_REF),
|
||||
SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101,
|
||||
"DFI LanParty", STAC_REF),
|
||||
/* Dell laptops have BIOS problem */
|
||||
|
@ -2344,6 +2342,8 @@ static struct snd_pci_quirk stac9205_cfg_tbl[] = {
|
|||
/* SigmaTel reference board */
|
||||
SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
|
||||
"DFI LanParty", STAC_9205_REF),
|
||||
SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0xfb30,
|
||||
"SigmaTel", STAC_9205_REF),
|
||||
SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101,
|
||||
"DFI LanParty", STAC_9205_REF),
|
||||
/* Dell */
|
||||
|
|
Loading…
Reference in a new issue