aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorPrzemyslaw Bruski <pbruskispam@op.pl>2011-03-13 16:18:58 +0100
committerPaul Gortmaker <paul.gortmaker@windriver.com>2011-06-26 12:47:06 -0400
commit88679f08f49fcb492ddc2d473092d0df42448cb8 (patch)
treecedba7b9d92c1d196734fcfdbbeaa4208924b716 /sound
parentcb5c9b58d847490318cc0b90e00002290d15fdd3 (diff)
ALSA: ctxfi - Clear input settings before initialization
commit efed5f26664f93991c929d5bb343e65f900d72bc upstream. Clear input settings before initialization. Signed-off-by: Przemyslaw Bruski <pbruskispam@op.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/ctxfi/ctdaio.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/ctxfi/ctdaio.c b/sound/pci/ctxfi/ctdaio.c
index af56eb949bd..47d9ea97de0 100644
--- a/sound/pci/ctxfi/ctdaio.c
+++ b/sound/pci/ctxfi/ctdaio.c
@@ -176,6 +176,7 @@ static int dao_set_left_input(struct dao *dao, struct rsc *input)
if (!entry)
return -ENOMEM;
+ dao->ops->clear_left_input(dao);
/* Program master and conjugate resources */
input->ops->master(input);
daio->rscl.ops->master(&daio->rscl);
@@ -204,6 +205,7 @@ static int dao_set_right_input(struct dao *dao, struct rsc *input)
if (!entry)
return -ENOMEM;
+ dao->ops->clear_right_input(dao);
/* Program master and conjugate resources */
input->ops->master(input);
daio->rscr.ops->master(&daio->rscr);