Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[net-next-2.6.git] / drivers / staging / tm6000 / tm6000-alsa.c

diff --git a/drivers/staging/tm6000/tm6000-alsa.c b/drivers/staging/tm6000/tm6000-alsa.c
index a99101fef1a39ee3991a3db7752b396b5a18860d..184cc505ed86c86370e24e0328e12fd253c10d54 100644 (file)
--- a/drivers/staging/tm6000/tm6000-alsa.c
+++ b/drivers/staging/tm6000/tm6000-alsa.c
@@ -201,6 +201,14 @@ _error:
  */
 static int snd_tm6000_close(struct snd_pcm_substream *substream)
 {
+       struct snd_tm6000_card *chip = snd_pcm_substream_chip(substream);
+       struct tm6000_core *core = chip->core;
+
+       if (atomic_read(&core->stream_started) > 0) {
+               atomic_set(&core->stream_started, 0);
+               schedule_work(&core->wq_trigger);
+       }
+
        return 0;
 }
 
@@ -213,6 +221,9 @@ static int tm6000_fillbuf(struct tm6000_core *core, char *buf, int size)
        unsigned int stride, buf_pos;
        int length;
 
+       if (atomic_read(&core->stream_started) == 0)
+               return 0;
+
        if (!size || !substream) {
                dprintk(1, "substream was NULL\n");
                return -EINVAL;
@@ -298,8 +309,12 @@ static int snd_tm6000_hw_params(struct snd_pcm_substream *substream,
 static int snd_tm6000_hw_free(struct snd_pcm_substream *substream)
 {
        struct snd_tm6000_card *chip = snd_pcm_substream_chip(substream);
+       struct tm6000_core *core = chip->core;
 
-       _tm6000_stop_audio_dma(chip);
+       if (atomic_read(&core->stream_started) > 0) {
+               atomic_set(&core->stream_started, 0);
+               schedule_work(&core->wq_trigger);
+       }
 
        return 0;
 }
@@ -321,30 +336,42 @@ static int snd_tm6000_prepare(struct snd_pcm_substream *substream)
 /*
  * trigger callback
  */
+static void audio_trigger(struct work_struct *work)
+{
+       struct tm6000_core *core = container_of(work, struct tm6000_core,
+                                               wq_trigger);
+       struct snd_tm6000_card *chip = core->adev;
+
+       if (atomic_read(&core->stream_started)) {
+               dprintk(1, "starting capture");
+               _tm6000_start_audio_dma(chip);
+       } else {
+               dprintk(1, "stopping capture");
+               _tm6000_stop_audio_dma(chip);
+       }
+}
+
 static int snd_tm6000_card_trigger(struct snd_pcm_substream *substream, int cmd)
 {
        struct snd_tm6000_card *chip = snd_pcm_substream_chip(substream);
-       int err;
-
-       spin_lock(&chip->reg_lock);
+       struct tm6000_core *core = chip->core;
+       int err = 0;
 
        switch (cmd) {
        case SNDRV_PCM_TRIGGER_START:
-               err = _tm6000_start_audio_dma(chip);
+               atomic_set(&core->stream_started, 1);
                break;
        case SNDRV_PCM_TRIGGER_STOP:
-               err = _tm6000_stop_audio_dma(chip);
+               atomic_set(&core->stream_started, 0);
                break;
        default:
                err = -EINVAL;
                break;
        }
-
-       spin_unlock(&chip->reg_lock);
+       schedule_work(&core->wq_trigger);
 
        return err;
 }
-
 /*
  * pointer callback
  */
@@ -429,7 +456,7 @@ int tm6000_audio_init(struct tm6000_core *dev)
 
        rc = snd_pcm_new(card, "TM6000 Audio", 0, 0, 1, &pcm);
        if (rc < 0)
-               goto error;
+               goto error_chip;
 
        pcm->info_flags = 0;
        pcm->private_data = chip;
@@ -437,14 +464,18 @@ int tm6000_audio_init(struct tm6000_core *dev)
 
        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_tm6000_pcm_ops);
 
+       INIT_WORK(&dev->wq_trigger, audio_trigger);
        rc = snd_card_register(card);
        if (rc < 0)
-               goto error;
+               goto error_chip;
 
        dprintk(1,"Registered audio driver for %s\n", card->longname);
 
        return 0;
 
+error_chip:
+       kfree(chip);
+       dev->adev = NULL;
 error:
        snd_card_free(card);
        return rc;