summaryrefslogtreecommitdiff
path: root/sound/pci
diff options
context:
space:
mode:
authorPrzemyslaw Bruski <pbruskispam@op.pl>2011-03-13 16:18:58 +0100
committerTakashi Iwai <tiwai@suse.de>2011-03-14 11:19:43 +0100
commitefed5f26664f93991c929d5bb343e65f900d72bc (patch)
tree1c8f2220b3bdc415f1faeff9e2981b5a0c0e84ed /sound/pci
parentf164753a263bfd2daaf3e0273b179de7e099c57d (diff)
downloadlinux-3.10-efed5f26664f93991c929d5bb343e65f900d72bc.tar.gz
linux-3.10-efed5f26664f93991c929d5bb343e65f900d72bc.tar.bz2
linux-3.10-efed5f26664f93991c929d5bb343e65f900d72bc.zip
ALSA: ctxfi - Clear input settings before initialization
Clear input settings before initialization. Signed-off-by: Przemyslaw Bruski <pbruskispam@op.pl> Cc: <stable@kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-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);