mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-03 09:29:42 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix/hda' into topic/hda

Browse source
This commit is contained in:
Takashi Iwai 2009-02-13 11:59:26 +01:00
commit c8a1a8985d
4 changed files with 34 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sound/pci/hda/hda_codec.c
View file

@ -3119,6 +3119,16 @@ int snd_hda_multi_out_dig_prepare(struct hda_codec *codec,
} }
EXPORT_SYMBOL_HDA(snd_hda_multi_out_dig_prepare); EXPORT_SYMBOL_HDA(snd_hda_multi_out_dig_prepare);
int snd_hda_multi_out_dig_cleanup(struct hda_codec *codec,
struct hda_multi_out *mout)
{
mutex_lock(&codec->spdif_mutex);
cleanup_dig_out_stream(codec, mout->dig_out_nid);
mutex_unlock(&codec->spdif_mutex);
return 0;
}
EXPORT_SYMBOL_HDA(snd_hda_multi_out_dig_cleanup);
/* /*
* release the digital out * release the digital out
*/ */

2
sound/pci/hda/hda_local.h
View file

@ -254,6 +254,8 @@ int snd_hda_multi_out_dig_prepare(struct hda_codec *codec,
unsigned int stream_tag, unsigned int stream_tag,
unsigned int format, unsigned int format,
struct snd_pcm_substream *substream); struct snd_pcm_substream *substream);
int snd_hda_multi_out_dig_cleanup(struct hda_codec *codec,
struct hda_multi_out *mout);
int snd_hda_multi_out_analog_open(struct hda_codec *codec, int snd_hda_multi_out_analog_open(struct hda_codec *codec,
struct hda_multi_out *mout, struct hda_multi_out *mout,
struct snd_pcm_substream *substream, struct snd_pcm_substream *substream,

15
sound/pci/hda/patch_analog.c
View file

@ -301,6 +301,14 @@ static int ad198x_dig_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
format, substream); format, substream);
} }
static int ad198x_dig_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
struct hda_codec *codec,
struct snd_pcm_substream *substream)
{
struct ad198x_spec *spec = codec->spec;
return snd_hda_multi_out_dig_cleanup(codec, &spec->multiout);
}
/* /*
* Analog capture * Analog capture
*/ */
@ -359,7 +367,8 @@ static struct hda_pcm_stream ad198x_pcm_digital_playback = {
.ops = { .ops = {
.open = ad198x_dig_playback_pcm_open, .open = ad198x_dig_playback_pcm_open,
.close = ad198x_dig_playback_pcm_close, .close = ad198x_dig_playback_pcm_close,
.prepare = ad198x_dig_playback_pcm_prepare .prepare = ad198x_dig_playback_pcm_prepare,
.cleanup = ad198x_dig_playback_pcm_cleanup
}, },
}; };
@ -1923,8 +1932,8 @@ static hda_nid_t ad1988_capsrc_nids[3] = {
#define AD1988_SPDIF_OUT_HDMI 0x0b #define AD1988_SPDIF_OUT_HDMI 0x0b
#define AD1988_SPDIF_IN 0x07 #define AD1988_SPDIF_IN 0x07
static hda_nid_t ad1989b_slave_dig_outs[2] = { static hda_nid_t ad1989b_slave_dig_outs[] = {
AD1988_SPDIF_OUT, AD1988_SPDIF_OUT_HDMI AD1988_SPDIF_OUT, AD1988_SPDIF_OUT_HDMI, 0
}; };
static struct hda_input_mux ad1988_6stack_capture_source = { static struct hda_input_mux ad1988_6stack_capture_source = {

11
sound/pci/hda/patch_sigmatel.c
View file

@ -2439,6 +2439,14 @@ static int stac92xx_dig_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
stream_tag, format, substream); stream_tag, format, substream);
} }
static int stac92xx_dig_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
struct hda_codec *codec,
struct snd_pcm_substream *substream)
{
struct sigmatel_spec *spec = codec->spec;
return snd_hda_multi_out_dig_cleanup(codec, &spec->multiout);
}
/* /*
* Analog capture callbacks * Analog capture callbacks
@ -2483,7 +2491,8 @@ static struct hda_pcm_stream stac92xx_pcm_digital_playback = {
.ops = { .ops = {
.open = stac92xx_dig_playback_pcm_open, .open = stac92xx_dig_playback_pcm_open,
.close = stac92xx_dig_playback_pcm_close, .close = stac92xx_dig_playback_pcm_close,
.prepare = stac92xx_dig_playback_pcm_prepare .prepare = stac92xx_dig_playback_pcm_prepare,
.cleanup = stac92xx_dig_playback_pcm_cleanup
}, },
}; };