[alsa-devel] sound/trivial: some little typo and little fix
Hi,
This is a tiny patch series with two typos and one error path fix. More interesting stuff will come ;-)
Best regards,
Signed-off-by: Nicolas Ferre nicolas.ferre@atmel.com --- sound/soc/atmel/atmel-pcm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/soc/atmel/atmel-pcm.c b/sound/soc/atmel/atmel-pcm.c index d0e7532..51dde4e 100644 --- a/sound/soc/atmel/atmel-pcm.c +++ b/sound/soc/atmel/atmel-pcm.c @@ -382,7 +382,7 @@ static int atmel_pcm_new(struct snd_card *card, }
if (dai->driver->capture.channels_min) { - pr_debug("at32-pcm:" + pr_debug("atmel-pcm:" "Allocating PCM capture DMA buffer\n"); ret = atmel_pcm_preallocate_dma_buffer(pcm, SNDRV_PCM_STREAM_CAPTURE);
On 26/05/11 12:44, Nicolas Ferre wrote:
Signed-off-by: Nicolas Ferre nicolas.ferre@atmel.com
All
Acked-by: Liam Girdwood lrg@ti.com
Signed-off-by: Nicolas Ferre nicolas.ferre@atmel.com --- sound/soc/atmel/atmel-pcm.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/soc/atmel/atmel-pcm.h b/sound/soc/atmel/atmel-pcm.h index 2597329..5e0a95e 100644 --- a/sound/soc/atmel/atmel-pcm.h +++ b/sound/soc/atmel/atmel-pcm.h @@ -60,7 +60,7 @@ struct atmel_ssc_mask { * This structure, shared between the PCM driver and the interface, * contains all information required by the PCM driver to perform the * PDC DMA operation. All fields except dma_intr_handler() are initialized - * by the interface. The dms_intr_handler() pointer is set by the PCM + * by the interface. The dma_intr_handler() pointer is set by the PCM * driver and called by the interface SSC interrupt handler if it is * non-NULL. */
We do not have to free a resource that is not allocated yet.
Signed-off-by: Nicolas Ferre nicolas.ferre@atmel.com --- sound/soc/atmel/atmel_ssc_dai.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index 7fbfa05..a7a7bbc 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -838,10 +838,8 @@ int atmel_ssc_set_audio(int ssc_id) }
ssc_pdev = platform_device_alloc("atmel-ssc-dai", ssc_id); - if (!ssc_pdev) { - ssc_free(ssc); + if (!ssc_pdev) return -ENOMEM; - }
/* If we can grab the SSC briefly to parent the DAI device off it */ ssc = ssc_request(ssc_id);
On Thu, May 26, 2011 at 01:44:09PM +0200, Nicolas Ferre wrote:
Hi,
This is a tiny patch series with two typos and one error path fix. More interesting stuff will come ;-)
Applied all, thanks.
Please do try to use subject lines for your patches which are consistent with the rest of the subsystem - it makes them much easier to apply.
participants (3)
-
Liam Girdwood -
Mark Brown -
Nicolas Ferre