Skip to contentSkip to conversation

ASoC: au1x updates for 2.6.33

PATCH Applied Manuel Lauss 2 participants 4 messages Dec 1, 2009 – Dec 3, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover ASoC: au1x updates for 2.6.33

Hi Mark,

The following two patches fix 2 issues in the updated au1x asoc drivers in your/Takashis queue for 2.6.33. If possible, please either fold them into commit 0f83d639d84c99a775c60696dbde77372c2cf4ac ("au1x: convert to platform drivers") found in Takashi's tree.

Thank you!
Manuel Lauss

Manuel Lauss (2):
ASoC: au1x: dbdma2: fix oops on soc device removal.
ASoC: au1x: dbdma2: plug memleak in pcm device creation error path

 sound/soc/au1x/dbdma2.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
#1 lore raw

PATCH 1/2 ASoC: au1x: dbdma2: fix oops on soc device removal.

platform_device_unregister() frees resources for us, no need to do it explicitly. Fixes an oops when machine code removes the soc-audio device.

---
 sound/soc/au1x/dbdma2.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
sound/soc/au1x/dbdma2.c +1 -4
index b8965d9..148e205 100644
@@ -486,11 +486,8 @@ EXPORT_SYMBOL_GPL(au1xpsc_pcm_add);
 
 void au1xpsc_pcm_destroy(struct platform_device *dmapd)
 {
-	if (dmapd) {
-		kfree(dmapd->resource);
-		dmapd->resource = NULL;
+	if (dmapd)
 		platform_device_unregister(dmapd);
-	}
 }
 EXPORT_SYMBOL_GPL(au1xpsc_pcm_destroy);
 
Signature · 1 line
1.6.5.3
#2 lore raw

PATCH 2/2 ASoC: au1x: dbdma2: plug memleak in pcm device creation error path

free the allocated pcm platform device in the error path.

---
 sound/soc/au1x/dbdma2.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
sound/soc/au1x/dbdma2.c +1 -0
index 148e205..6d9f4c6 100644
@@ -478,6 +478,7 @@ struct platform_device *au1xpsc_pcm_add(struct platform_device *pdev)
 	if (!ret)
 		return pd;
 
+	platform_device_put(pd);
 out:
 	kfree(res);
 	return NULL;
Signature · 1 line
1.6.5.3
Applied
#3 lore raw
In reply to Manuel Lauss
Quoted 4 lines · Manuel Lauss

The following two patches fix 2 issues in the updated au1x asoc drivers in your/Takashis queue for 2.6.33. If possible, please either fold them into commit 0f83d639d84c99a775c60696dbde77372c2cf4ac ("au1x: convert to platform drivers") found in Takashi's tree.

Applied both, thanks.