]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ALSA: ctxfi - Clear input settings before initialization
authorPrzemyslaw Bruski <pbruskispam@op.pl>
Sun, 13 Mar 2011 15:18:58 +0000 (16:18 +0100)
committerAK <andi@firstfloor.org>
Thu, 31 Mar 2011 18:58:40 +0000 (11:58 -0700)
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>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
sound/pci/ctxfi/ctdaio.c

index af56eb949bded282affb84a59691dc49f3d3054e..47d9ea97de02e28cc0d7f9064a39a8c9222e29d0 100644 (file)
@@ -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);