Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[fuel-plugin] Align with fuel 10.0/newton
[kvmfornfv.git]
/
kernel
/
sound
/
arm
/
pxa2xx-pcm.c
diff --git
a/kernel/sound/arm/pxa2xx-pcm.c
b/kernel/sound/arm/pxa2xx-pcm.c
index
83be8e3
..
83fcfac
100644
(file)
--- a/
kernel/sound/arm/pxa2xx-pcm.c
+++ b/
kernel/sound/arm/pxa2xx-pcm.c
@@
-46,17
+46,13
@@
static int pxa2xx_pcm_open(struct snd_pcm_substream *substream)
rtd->params = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ?
client->playback_params : client->capture_params;
rtd->params = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ?
client->playback_params : client->capture_params;
- ret = pxa_request_dma("dma", DMA_PRIO_LOW,
- pxa2xx_pcm_dma_irq, substream);
- if (ret < 0)
- goto err2;
- rtd->dma_ch = ret;
ret = client->startup(substream);
if (!ret)
ret = client->startup(substream);
if (!ret)
- goto out;
+ goto err2;
+
+ return 0;
- pxa_free_dma(rtd->dma_ch);
err2:
__pxa2xx_pcm_close(substream);
out:
err2:
__pxa2xx_pcm_close(substream);
out:
@@
-66,9
+62,7
@@
static int pxa2xx_pcm_open(struct snd_pcm_substream *substream)
static int pxa2xx_pcm_close(struct snd_pcm_substream *substream)
{
struct pxa2xx_pcm_client *client = substream->private_data;
static int pxa2xx_pcm_close(struct snd_pcm_substream *substream)
{
struct pxa2xx_pcm_client *client = substream->private_data;
- struct pxa2xx_runtime_data *rtd = substream->runtime->private_data;
- pxa_free_dma(rtd->dma_ch);
client->shutdown(substream);
return __pxa2xx_pcm_close(substream);
client->shutdown(substream);
return __pxa2xx_pcm_close(substream);