ALSA: virtio: build PCM devices and substream hardware descriptors

[sfrench/cifs-2.6.git] / sound / virtio / virtio_card.c

diff --git a/sound/virtio/virtio_card.c b/sound/virtio/virtio_card.c
index b757b2444078fcfa39e9ebe913d88f0aba8bdacf..11c76ee311b77c0640dc9bb53e955ab4a77aa77d 100644 (file)
--- a/sound/virtio/virtio_card.c
+++ b/sound/virtio/virtio_card.c
@@ -209,6 +209,16 @@ static int virtsnd_build_devs(struct virtio_snd *snd)
                         VIRTIO_SND_CARD_NAME " at %s/%s",
                         dev_name(dev->parent), dev_name(dev));
 
+       rc = virtsnd_pcm_parse_cfg(snd);
+       if (rc)
+               return rc;
+
+       if (snd->nsubstreams) {
+               rc = virtsnd_pcm_build_devs(snd);
+               if (rc)
+                       return rc;
+       }
+
        return snd_card_register(snd->card);
 }
 
@@ -237,6 +247,9 @@ static int virtsnd_validate(struct virtio_device *vdev)
                return -EINVAL;
        }
 
+       if (virtsnd_pcm_validate(vdev))
+               return -EINVAL;
+
        return 0;
 }
 
@@ -259,6 +272,7 @@ static int virtsnd_probe(struct virtio_device *vdev)
 
        snd->vdev = vdev;
        INIT_LIST_HEAD(&snd->ctl_msgs);
+       INIT_LIST_HEAD(&snd->pcm_list);
 
        vdev->priv = snd;
 
@@ -293,6 +307,7 @@ on_exit:
 static void virtsnd_remove(struct virtio_device *vdev)
 {
        struct virtio_snd *snd = vdev->priv;
+       unsigned int i;
 
        virtsnd_disable_event_vq(snd);
        virtsnd_ctl_msg_cancel_all(snd);
@@ -303,6 +318,9 @@ static void virtsnd_remove(struct virtio_device *vdev)
        vdev->config->del_vqs(vdev);
        vdev->config->reset(vdev);
 
+       for (i = 0; snd->substreams && i < snd->nsubstreams; ++i)
+               cancel_work_sync(&snd->substreams[i].elapsed_period);
+
        kfree(snd->event_msgs);
 }