openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ALSA: hdac: Remove the usage of key for host stream 

hdac_ext_stream assign doesn't require key mapping as in case of
hdac_stream. So for host stream, the key to device mapping needs
to be removed.

Signed-off-by: Jeeja KP <jeeja.kp@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Jeeja KP 2015-08-21 21:36:21 +05:30 committed by Takashi Iwai
parent ee8bc4df1b
commit f09d4f26f6
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/hda/ext/hdac_ext_stream.c
View File

@ -291,17 +291,12 @@ hdac_ext_host_stream_assign(struct hdac_ext_bus *ebus,
struct hdac_ext_stream *res = NULL; struct hdac_ext_stream *res = NULL;
struct hdac_stream *stream = NULL; struct hdac_stream *stream = NULL;
struct hdac_bus *hbus = &ebus->bus; struct hdac_bus *hbus = &ebus->bus;
int key;
if (!ebus->ppcap) { if (!ebus->ppcap) {
dev_err(hbus->dev, "stream type not supported\n"); dev_err(hbus->dev, "stream type not supported\n");
return NULL; return NULL;
} }
/* make a non-zero unique key for the substream */
key = (substream->pcm->device << 16) | (substream->number << 2) |
(substream->stream + 1);
list_for_each_entry(stream, &hbus->stream_list, list) { list_for_each_entry(stream, &hbus->stream_list, list) {
struct hdac_ext_stream *hstream = container_of(stream, struct hdac_ext_stream *hstream = container_of(stream,
struct hdac_ext_stream, struct hdac_ext_stream,
@ -320,7 +315,6 @@ hdac_ext_host_stream_assign(struct hdac_ext_bus *ebus,
spin_lock_irq(&hbus->reg_lock); spin_lock_irq(&hbus->reg_lock);
res->hstream.opened = 1; res->hstream.opened = 1;
res->hstream.running = 0; res->hstream.running = 0;
res->hstream.assigned_key = key;
res->hstream.substream = substream; res->hstream.substream = substream;
spin_unlock_irq(&hbus->reg_lock); spin_unlock_irq(&hbus->reg_lock);
} }