leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: hda - Move prepared flag into struct hdac_stream

Browse Source 
This flag seems used commonly, so deserves to be located there.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2015-04-17 13:34:30 +02:00
parent 0a50575b64
commit 6d23c8f544
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sound/hdaudio.h
View File

@ -390,6 +390,7 @@ struct hdac_stream {
bool opened:1;
bool running:1;
bool prepared:1;
bool no_period_wakeup:1;
bool locked:1;

8
sound/pci/hda/hda_controller.c
View File

@ -145,7 +145,7 @@ static int azx_pcm_hw_free(struct snd_pcm_substream *substream)
snd_hda_codec_cleanup(apcm->codec, hinfo, substream);
err = chip->ops->substream_free_pages(chip, substream);
azx_dev->prepared = 0;
azx_stream(azx_dev)->prepared = 0;
dsp_unlock(azx_dev);
return err;
}
@ -214,7 +214,7 @@ static int azx_pcm_prepare(struct snd_pcm_substream *substream)
unlock:
if (!err)
azx_dev->prepared = 1;
azx_stream(azx_dev)->prepared = 1;
dsp_unlock(azx_dev);
return err;
}
@ -240,7 +240,7 @@ static int azx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
else
sync_reg = AZX_REG_SSYNC;
if (dsp_is_locked(azx_dev) || !azx_dev->prepared)
if (dsp_is_locked(azx_dev) || !hstr->prepared)
return -EPIPE;
switch (cmd) {
@ -843,7 +843,7 @@ int snd_hda_codec_load_dsp_prepare(struct hda_codec *codec, unsigned int format,
return err;
}
azx_dev->prepared = 0;
hstr->prepared = 0;
return err;
}
EXPORT_SYMBOL_GPL(snd_hda_codec_load_dsp_prepare);

1
sound/pci/hda/hda_controller.h
View File

@ -62,7 +62,6 @@ struct azx_dev {
struct hdac_stream core;
unsigned int irq_pending:1;
unsigned int prepared:1;
/*
* For VIA:
* A flag to ensure DMA position is 0