ALSA: ctxfi: initialized snd_card

initialized the reference of snd_card which was added to the various
structures through the previous patch of the series.
these references of snd_card will be used in a later patch to convert
the pr_* macros to dev_*

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/ctxfi/ctamixer.c b/sound/pci/ctxfi/ctamixer.c
index 4671cbe7b39745cd9e3911d220ef7d2630819bf6..4d389c330978129de07fb6d7d66f67058dbc525d 100644 (file)
--- a/sound/pci/ctxfi/ctamixer.c
+++ b/sound/pci/ctxfi/ctamixer.c
@@ -314,6 +314,7 @@ int amixer_mgr_create(struct hw *hw, struct amixer_mgr **ramixer_mgr)
 
        amixer_mgr->get_amixer = get_amixer_rsc;
        amixer_mgr->put_amixer = put_amixer_rsc;
+       amixer_mgr->card = hw->card;
 
        *ramixer_mgr = amixer_mgr;
 
@@ -467,6 +468,7 @@ int sum_mgr_create(struct hw *hw, struct sum_mgr **rsum_mgr)
 
        sum_mgr->get_sum = get_sum_rsc;
        sum_mgr->put_sum = put_sum_rsc;
+       sum_mgr->card = hw->card;
 
        *rsum_mgr = sum_mgr;
 

diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c
index e536ab97ddebc537cc35df0522f04debbf8520a5..5cc8c3860b11ab6d4c4c3563df506fc27aa732e0 100644 (file)
--- a/sound/pci/ctxfi/ctatc.c
+++ b/sound/pci/ctxfi/ctatc.c
@@ -1333,6 +1333,7 @@ static int atc_create_hw_devs(struct ct_atc *atc)
                pr_err("Failed to create hw obj!!!\n");
                return err;
        }
+       hw->card = atc->card;
        atc->hw = hw;
 
        /* Initialize card hardware. */

diff --git a/sound/pci/ctxfi/ctdaio.c b/sound/pci/ctxfi/ctdaio.c
index aa4aa712c28567d0caa33a5efe411035227893a7..212280e11f6ed3ece9171bc5f7c7debbc0d3ecec 100644 (file)
--- a/sound/pci/ctxfi/ctdaio.c
+++ b/sound/pci/ctxfi/ctdaio.c
@@ -725,6 +725,7 @@ int daio_mgr_create(struct hw *hw, struct daio_mgr **rdaio_mgr)
        daio_mgr->imap_add = daio_imap_add;
        daio_mgr->imap_delete = daio_imap_delete;
        daio_mgr->commit_write = daio_mgr_commit_write;
+       daio_mgr->card = hw->card;
 
        for (i = 0; i < 8; i++) {
                hw->daio_mgr_dsb_dao(daio_mgr->mgr.ctrl_blk, i);

diff --git a/sound/pci/ctxfi/ctsrc.c b/sound/pci/ctxfi/ctsrc.c
index d3ef213fad77a2fc66e482cd844b3bb3f48baf60..50fa35bc66d224162031b7b82beab8840ac45b2c 100644 (file)
--- a/sound/pci/ctxfi/ctsrc.c
+++ b/sound/pci/ctxfi/ctsrc.c
@@ -566,6 +566,7 @@ int src_mgr_create(struct hw *hw, struct src_mgr **rsrc_mgr)
        src_mgr->src_enable = src_enable;
        src_mgr->src_disable = src_disable;
        src_mgr->commit_write = src_mgr_commit_write;
+       src_mgr->card = hw->card;
 
        /* Disable all SRC resources. */
        for (i = 0; i < 256; i++)
@@ -857,6 +858,7 @@ int srcimp_mgr_create(struct hw *hw, struct srcimp_mgr **rsrcimp_mgr)
        srcimp_mgr->put_srcimp = put_srcimp_rsc;
        srcimp_mgr->imap_add = srcimp_imap_add;
        srcimp_mgr->imap_delete = srcimp_imap_delete;
+       srcimp_mgr->card = hw->card;
 
        *rsrcimp_mgr = srcimp_mgr;