MTD: merge 3.18 development into -next development

[deliverable/linux.git] / sound / pcmcia / pdaudiocf / pdaudiocf_pcm.c

diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c b/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c
index 43f995a3f96033c081499dd41002541279252b95..b48aa0a78c19b42583d7d25e58dcdb94cb0cb61f 100644 (file)
--- a/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c
@@ -77,7 +77,7 @@ static int pdacf_pcm_trigger(struct snd_pcm_substream *subs, int cmd)
        default:
                return -EINVAL;
        }
-       spin_lock(&chip->reg_lock);
+       mutex_lock(&chip->reg_lock);
        chip->pcm_running += inc;
        tmp = pdacf_reg_read(chip, PDAUDIOCF_REG_SCR);
        if (chip->pcm_running) {
@@ -91,7 +91,7 @@ static int pdacf_pcm_trigger(struct snd_pcm_substream *subs, int cmd)
        tmp |= val;
        pdacf_reg_write(chip, PDAUDIOCF_REG_SCR, tmp);
       __end:
-       spin_unlock(&chip->reg_lock);
+       mutex_unlock(&chip->reg_lock);
        snd_ak4117_check_rate_and_errors(chip->ak4117, AK4117_CHECK_NO_RATE);
        return ret;
 }
@@ -296,6 +296,7 @@ int snd_pdacf_pcm_new(struct snd_pdacf *chip)
 
        pcm->private_data = chip;
        pcm->info_flags = 0;
+       pcm->nonatomic = true;
        strcpy(pcm->name, chip->card->shortname);
        chip->pcm = pcm;