openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Sudip Mukherjee 2014-09-29 14:33:24 +05:30 committed by Takashi Iwai
parent 3d0fdc86e4
commit e5347f9ab7
4 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/pci/ctxfi/ctamixer.c
View File

@ -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;

1
sound/pci/ctxfi/ctatc.c
View File

@ -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. */

1
sound/pci/ctxfi/ctdaio.c
View File

@ -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);

2
sound/pci/ctxfi/ctsrc.c
View File

@ -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;