summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPrzemyslaw Bruski <pbruskispam@op.pl>2011-03-13 16:18:58 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-23 13:16:52 -0700
commitdc655ad7c9075c577492d8b53c23c9203c5928ae (patch)
treeed2f82cf4582b39ee7afd821b1ced67215a292be
parent6e81878cf3d41708bdc4710cfef32873b229d698 (diff)
downloadlwn-dc655ad7c9075c577492d8b53c23c9203c5928ae.tar.gz
lwn-dc655ad7c9075c577492d8b53c23c9203c5928ae.zip
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: Greg Kroah-Hartman <gregkh@suse.de>
-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 af56eb949bde..47d9ea97de02 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);