diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-03-18 07:39:08 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-03-18 07:39:08 +0100 |
| commit | d351cf4603edb2a5bfa9a48d06c425511c63f2a3 (patch) | |
| tree | b03ea3cfd3ca3974237563cf87328386c3d49ff1 /sound/pci/ctxfi/ctdaio.c | |
| parent | 433e8327caf9f7c0432b2f2f6684a5b79cfe18e9 (diff) | |
| parent | 4a122c10fbfe9020df469f0f669da129c5757671 (diff) | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/ctxfi/ctdaio.c')
| -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 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); |