Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-16 17:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: pxa-ssp: fix SSP port request

Browse Source 
PXA2xx/3xx SSP ports start from 1, not 0. Thus, the probe function
requested the wrong SSP port. Correcting this unveiled another bug
where ssp_init tries to request the already-requested SSP port again.
So this patch replaces the ssp_init/exit calls with their internals
from mach-pxa/ssp.c, leaving out the redundant ssp_request and the
unneeded IRQ request. Effectively, that leaves us with not much more
than enabling/disabling the SSP clock.

Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Philipp Zabel 2009-02-03 21:18:26 +01:00 committed by Mark Brown
parent 5b2474425e
commit 0664678a84
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sound/soc/pxa/pxa-ssp.c
View File

@ -21,6 +21,8 @@
#include <linux/clk.h>
#include <linux/io.h>
#include <asm/irq.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/initval.h>
@ -221,9 +223,9 @@ static int pxa_ssp_startup(struct snd_pcm_substream *substream,
int ret = 0;
if (!cpu_dai->active) {
ret = ssp_init(&priv->dev, cpu_dai->id + 1, SSP_NO_IRQ);
if (ret < 0)
return ret;
priv->dev.port = cpu_dai->id + 1;
priv->dev.irq = NO_IRQ;
clk_enable(priv->dev.ssp->clk);
ssp_disable(&priv->dev);
}
return ret;
@ -238,7 +240,7 @@ static void pxa_ssp_shutdown(struct snd_pcm_substream *substream,
if (!cpu_dai->active) {
ssp_disable(&priv->dev);
ssp_exit(&priv->dev);
clk_disable(priv->dev.ssp->clk);
}
}
@ -751,7 +753,7 @@ static int pxa_ssp_probe(struct platform_device *pdev,
if (!priv)
return -ENOMEM;
priv->dev.ssp = ssp_request(dai->id, "SoC audio");
priv->dev.ssp = ssp_request(dai->id + 1, "SoC audio");
if (priv->dev.ssp == NULL) {
ret = -ENODEV;
goto err_priv;