Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfa7c70b authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.37' into for-2.6.38

parents 55110276 b76fb39d

sound/soc/nuc900/nuc900-pcm.c

+5 −4
Original line number Diff line number Diff line
@@ -50,12 +50,12 @@ static int nuc900_dma_hw_params(struct snd_pcm_substream *substream, 
	unsigned long flags;

	int ret = 0;



	spin_lock_irqsave(&nuc900_audio->lock, flags);



	ret = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));

	if (ret < 0)

		return ret;



	spin_lock_irqsave(&nuc900_audio->lock, flags);



	nuc900_audio->substream = substream;

	nuc900_audio->dma_addr[substream->stream] = runtime->dma_addr;

	nuc900_audio->buffersize[substream->stream] =
@@ -169,6 +169,7 @@ static int nuc900_dma_prepare(struct snd_pcm_substream *substream) 
	struct snd_pcm_runtime *runtime = substream->runtime;

	struct nuc900_audio *nuc900_audio = runtime->private_data;

	unsigned long flags, val;

	int ret = 0;



	spin_lock_irqsave(&nuc900_audio->lock, flags);
@@ -197,10 +198,10 @@ static int nuc900_dma_prepare(struct snd_pcm_substream *substream) 
		AUDIO_WRITE(nuc900_audio->mmio + ACTL_RESET, val);

		break;

	default:

		return -EINVAL;

		ret = -EINVAL;

	}

	spin_unlock_irqrestore(&nuc900_audio->lock, flags);

	return 0;

	return ret;

}



static int nuc900_dma_trigger(struct snd_pcm_substream *substream, int cmd)

sound/soc/s6000/s6000-i2s.c

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ static struct snd_soc_dai_driver s6000_i2s_dai = { 
		.rate_max = 1562500,

	},

	.ops = &s6000_i2s_dai_ops,

}

};



static int __devinit s6000_i2s_probe(struct platform_device *pdev)

{

sound/soc/s6000/s6000-pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ static int s6000_pcm_new(struct snd_card *card, 
	}



	res = request_irq(params->irq, s6000_pcm_irq, IRQF_SHARED,

			  s6000_soc_platform.name, pcm);

			  "s6000-audio", pcm);

	if (res) {

		printk(KERN_ERR "s6000-pcm couldn't get IRQ\n");

		return res;

sound/soc/s6000/s6105-ipcam.c

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static int s6105_aic3x_init(struct snd_soc_pcm_runtime *rtd) 


	snd_soc_dapm_sync(dapm);



	snd_ctl_add(codec->snd_card, snd_ctl_new1(&audio_out_mux, codec));

	snd_ctl_add(codec->card->snd_card, snd_ctl_new1(&audio_out_mux, codec));



	return 0;

}