[PATCH v3 2/5] sound: pci: ctxfi: ctatc.c: added reference to card

[Sudip Mukherjee]

added reference of the card in the convert_format function
so that we can know which card has called the function

Signed-off-by: Sudip Mukherjee <su...@vectorindia.org>
---
 sound/pci/ctxfi/ctatc.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c
index b21eda4..3e29e13 100644
--- a/sound/pci/ctxfi/ctatc.c
+++ b/sound/pci/ctxfi/ctatc.c
@@ -171,7 +171,8 @@ static unsigned long atc_get_ptp_phys(struct ct_atc *atc, 
int index)
        return atc->vm->get_ptp_phys(atc->vm, index);
 }
 
-static unsigned int convert_format(snd_pcm_format_t snd_format)
+static unsigned int convert_format(snd_pcm_format_t snd_format,
+                                  struct snd_card *card)
 {
        switch (snd_format) {
        case SNDRV_PCM_FORMAT_U8:
@@ -268,7 +269,8 @@ static int atc_pcm_playback_prepare(struct ct_atc *atc, 
struct ct_atc_pcm *apcm)
        src = apcm->src;
        src->ops->set_pitch(src, pitch);
        src->ops->set_rom(src, select_rom(pitch));
-       src->ops->set_sf(src, convert_format(apcm->substream->runtime->format));
+       src->ops->set_sf(src, convert_format(apcm->substream->runtime->format,
+                                            atc->card));
        src->ops->set_pm(src, (src->ops->next_interleave(src) != NULL));
 
        /* Get AMIXER resource */
@@ -738,7 +740,8 @@ static int atc_pcm_capture_start(struct ct_atc *atc, struct 
ct_atc_pcm *apcm)
 
        /*  Set up recording SRC */
        src = apcm->src;
-       src->ops->set_sf(src, convert_format(apcm->substream->runtime->format));
+       src->ops->set_sf(src, convert_format(apcm->substream->runtime->format,
+                                            atc->card));
        src->ops->set_sa(src, apcm->vm_block->addr);
        src->ops->set_la(src, apcm->vm_block->addr + apcm->vm_block->size);
        src->ops->set_ca(src, apcm->vm_block->addr);
@@ -807,7 +810,8 @@ static int spdif_passthru_playback_get_resources(struct 
ct_atc *atc,
        src = apcm->src;
        src->ops->set_pitch(src, pitch);
        src->ops->set_rom(src, select_rom(pitch));
-       src->ops->set_sf(src, convert_format(apcm->substream->runtime->format));
+       src->ops->set_sf(src, convert_format(apcm->substream->runtime->format,
+                                            atc->card));
        src->ops->set_pm(src, (src->ops->next_interleave(src) != NULL));
        src->ops->set_bp(src, 1);
 
-- 
1.8.1.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/