summaryrefslogtreecommitdiff
path: root/drivers/staging/intel_sst/intelmid.c
diff options
context:
space:
mode:
authorDharageswari R <dharageswari.r@intel.com>2011-05-03 17:32:38 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-05-10 12:55:54 -0700
commit5572a44829f241e642e6c4ac120bf5e4d6295d8f (patch)
tree819efb6469f797b81858c376e2b42517ff2a9edd /drivers/staging/intel_sst/intelmid.c
parentc3e25a24b55d206dfa261fb2c7bb29b09f7bcf9b (diff)
intel_sst: Line out support
This patch adds the support for lineout. The lineout input can be selected as any input channel by using a new alsa mixer kcontrol. Signed-off-by: Dharageswari R <dharageswari.r@intel.com> Signed-off-by: Ramesh Babu K V <ramesh.babu@intel.com> Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/intel_sst/intelmid.c')
-rw-r--r--drivers/staging/intel_sst/intelmid.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/intel_sst/intelmid.c b/drivers/staging/intel_sst/intelmid.c
index 0925a88ed40e..ee070e3eecb5 100644
--- a/drivers/staging/intel_sst/intelmid.c
+++ b/drivers/staging/intel_sst/intelmid.c
@@ -187,7 +187,7 @@ static int snd_intelmad_pcm_prepare(struct snd_pcm_substream *substream)
return ret_val;
}
- ret_val = snd_intelmad_alloc_stream(substream);
+ ret_val = snd_intelmad_alloc_stream(substream);
if (ret_val < 0)
return ret_val;
stream->dbg_cum_bytes = 0;
@@ -797,6 +797,7 @@ static int __devinit snd_intelmad_sst_register(
intelmaddata->sstdrv_ops->scard_ops->input_dev_id = DMIC;
intelmaddata->sstdrv_ops->scard_ops->output_dev_id =
STEREO_HEADPHONE;
+ intelmaddata->sstdrv_ops->scard_ops->lineout_dev_id = NONE;
}
/* registering with SST driver to get access to SST APIs to use */