ALSA: virtio: introduce PCM channel map support

[linux-2.6-microblaze.git] / sound / virtio / virtio_card.c

diff --git a/sound/virtio/virtio_card.c b/sound/virtio/virtio_card.c
index 89bd66c..1c03fcc 100644 (file)
--- a/sound/virtio/virtio_card.c
+++ b/sound/virtio/virtio_card.c
@@ -231,6 +231,10 @@ static int virtsnd_build_devs(struct virtio_snd *snd)
        if (rc)
                return rc;
 
+       rc = virtsnd_chmap_parse_cfg(snd);
+       if (rc)
+               return rc;
+
        if (snd->njacks) {
                rc = virtsnd_jack_build_devs(snd);
                if (rc)
@@ -243,6 +247,12 @@ static int virtsnd_build_devs(struct virtio_snd *snd)
                        return rc;
        }
 
+       if (snd->nchmaps) {
+               rc = virtsnd_chmap_build_devs(snd);
+               if (rc)
+                       return rc;
+       }
+
        return snd_card_register(snd->card);
 }