diff options
author | Przemyslaw Bruski <pbruskispam@op.pl> | 2011-03-13 11:18:58 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-03-14 06:19:43 -0400 |
commit | efed5f26664f93991c929d5bb343e65f900d72bc (patch) | |
tree | 1c8f2220b3bdc415f1faeff9e2981b5a0c0e84ed /sound/pci | |
parent | f164753a263bfd2daaf3e0273b179de7e099c57d (diff) |
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.c | 2 |
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) | |||
176 | if (!entry) | 176 | if (!entry) |
177 | return -ENOMEM; | 177 | return -ENOMEM; |
178 | 178 | ||
179 | dao->ops->clear_left_input(dao); | ||
179 | /* Program master and conjugate resources */ | 180 | /* Program master and conjugate resources */ |
180 | input->ops->master(input); | 181 | input->ops->master(input); |
181 | daio->rscl.ops->master(&daio->rscl); | 182 | daio->rscl.ops->master(&daio->rscl); |
@@ -204,6 +205,7 @@ static int dao_set_right_input(struct dao *dao, struct rsc *input) | |||
204 | if (!entry) | 205 | if (!entry) |
205 | return -ENOMEM; | 206 | return -ENOMEM; |
206 | 207 | ||
208 | dao->ops->clear_right_input(dao); | ||
207 | /* Program master and conjugate resources */ | 209 | /* Program master and conjugate resources */ |
208 | input->ops->master(input); | 210 | input->ops->master(input); |
209 | daio->rscr.ops->master(&daio->rscr); | 211 | daio->rscr.ops->master(&daio->rscr); |