iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-2.6.37' into for-2.6.38

Browse Source
This commit is contained in:
Mark Brown 2010-11-30 11:35:43 +00:00
commit dfa7c70b04
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sound/soc/nuc900/nuc900-pcm.c
View File

@ -50,12 +50,12 @@ static int nuc900_dma_hw_params(struct snd_pcm_substream *substream,
unsigned long flags; unsigned long flags;
int ret = 0; int ret = 0;
spin_lock_irqsave(&nuc900_audio->lock, flags);
ret = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params)); ret = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));
if (ret < 0) if (ret < 0)
return ret; return ret;
spin_lock_irqsave(&nuc900_audio->lock, flags);
nuc900_audio->substream = substream; nuc900_audio->substream = substream;
nuc900_audio->dma_addr[substream->stream] = runtime->dma_addr; nuc900_audio->dma_addr[substream->stream] = runtime->dma_addr;
nuc900_audio->buffersize[substream->stream] = 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 snd_pcm_runtime *runtime = substream->runtime;
struct nuc900_audio *nuc900_audio = runtime->private_data; struct nuc900_audio *nuc900_audio = runtime->private_data;
unsigned long flags, val; unsigned long flags, val;
int ret = 0;
spin_lock_irqsave(&nuc900_audio->lock, flags); 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); AUDIO_WRITE(nuc900_audio->mmio + ACTL_RESET, val);
break; break;
default: default:
return -EINVAL; ret = -EINVAL;
} }
spin_unlock_irqrestore(&nuc900_audio->lock, flags); spin_unlock_irqrestore(&nuc900_audio->lock, flags);
return 0; return ret;
} }
static int nuc900_dma_trigger(struct snd_pcm_substream *substream, int cmd) static int nuc900_dma_trigger(struct snd_pcm_substream *substream, int cmd)

2
sound/soc/s6000/s6000-i2s.c
View File

@ -434,7 +434,7 @@ static struct snd_soc_dai_driver s6000_i2s_dai = {
.rate_max = 1562500, .rate_max = 1562500,
}, },
.ops = &s6000_i2s_dai_ops, .ops = &s6000_i2s_dai_ops,
} };
static int __devinit s6000_i2s_probe(struct platform_device *pdev) static int __devinit s6000_i2s_probe(struct platform_device *pdev)
{ {

2
sound/soc/s6000/s6000-pcm.c
View File

@ -473,7 +473,7 @@ static int s6000_pcm_new(struct snd_card *card,
} }
res = request_irq(params->irq, s6000_pcm_irq, IRQF_SHARED, res = request_irq(params->irq, s6000_pcm_irq, IRQF_SHARED,
s6000_soc_platform.name, pcm); "s6000-audio", pcm);
if (res) { if (res) {
printk(KERN_ERR "s6000-pcm couldn't get IRQ\n"); printk(KERN_ERR "s6000-pcm couldn't get IRQ\n");
return res; return res;

2
sound/soc/s6000/s6105-ipcam.c
View File

@ -168,7 +168,7 @@ static int s6105_aic3x_init(struct snd_soc_pcm_runtime *rtd)
snd_soc_dapm_sync(dapm); 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; return 0;
} }