: ARM DaVinci ASoC: Fix module unload error
PATCH 1/1 : ARM DaVinci ASoC: Fix module unload error
From: Chaithrika U S <[email protected]>
Fix for the error when the audio module is unloaded.
On unregistering the platform_device, platform_device_release will free the platform data.If platform data is static the kernel panics when it is freed. Instead use the platform device helper function to add data.
This change has been tested on DM644x EVM.
--- sound/soc/davinci/davinci-evm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
sound/soc/davinci/davinci-evm.c +1 -1
@@ -225,7 +225,7 @@ static int __init evm_init(void)platform_set_drvdata (evm_snd_device, &evm_snd_devdata); evm_snd_devdata.dev = &evm_snd_device->dev; - evm_snd_device->dev.platform_data = data; +platform_device_add_data (evm_snd_device, data,sizeof (data)); ret =platform_device_add_resources (evm_snd_device, resources,1 );if (ret) {
Signature · 1 line
1.5.6
Quoted 6 lines · On Fri, Feb 13, 2009 at 12:39:39PM +0530, [email protected] wrote:
From: Chaithrika U S <[email protected]>
Fix for the error when the audio module is unloaded.
On unregistering theplatform_device,platform_device_releasewill free the platform data.If platform data is static the kernel panics when it is freed. Instead use the platform device helper function to add data.
Which kernel tree is this patch against? It doesn't apply against either the topic/asoc or fix/asoc branch of
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git
Quoted 8 lines · Mark Brown
Quoted 6 lines · On Fri, Feb 13, 2009 at 12:39:39PM +0530, [email protected] wrote:
From: Chaithrika U S <[email protected]>
Fix for the error when the audio module is unloaded.
On unregistering theplatform_device,platform_device_releasewill free the platform data.If platform data is static the kernel panics when it is freed. Instead use the platform device helper function to add data.
Quoted 4 lines
Which kernel tree is this patch against? It doesn't apply against either the topic/asoc or fix/asoc branch of
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git
Hi Mark,
This patch is against DaVinci git[1], which still has some differences compared to the upstream trees.
Below is a version of this patch against Linus' tree, with the SFFSDR board changes from Hugo included.
Kevin
[1] http://git.kernel.org/?p=linux/kernel/git/khilman/linux-davinci.git;a=summary
commit 53748f550f8dcd2cad676e67804d69cd4424ab4f
Author: Chaithrika U S <[email protected]> Date: Fri Feb 13 12:39:39 2009 +0530
ASoC: DaVinci: fix module unload error
Fix for the error when the audio module is unloaded. On unregistering the platform_device, platform_device_release will free the platform data.If platform data is static the kernel panics when it is freed. Instead use the platform device helper function to add data.
This change has been tested on DM644x EVM, DM644x SFFSDR and DM355 EVM.
sound/soc/davinci/davinci-evm.c +2 -1
@@ -186,7 +186,8 @@ static int __init evm_init(void)platform_set_drvdata (evm_snd_device, &evm_snd_devdata); evm_snd_devdata.dev = &evm_snd_device->dev; - evm_snd_device->dev.platform_data = &evm_snd_data; +platform_device_add_data (evm_snd_device, &evm_snd_data, +sizeof (evm_snd_data)); ret =platform_device_add_resources (evm_snd_device, evm_snd_resources,ARRAY_SIZE (evm_snd_resources));
sound/soc/davinci/davinci-sffsdr.c +2 -1
@@ -127,7 +127,8 @@ static int __init sffsdr_init(void)platform_set_drvdata (sffsdr_snd_device, &sffsdr_snd_devdata); sffsdr_snd_devdata.dev = &sffsdr_snd_device->dev; - sffsdr_snd_device->dev.platform_data = &sffsdr_snd_data; +platform_device_add_data (sffsdr_snd_device, &sffsdr_snd_data, +sizeof (sffsdr_snd_data)); ret = platform_device_add_resources(sffsdr_snd_device, sffsdr_snd_resources,
Mark Brown
AppliedQuoted 5 lines · Kevin Hilman
This patch is against DaVinci git[1], which still has some differences compared to the upstream trees.
Below is a version of this patch against Linus' tree, with the SFFSDR board changes from Hugo included.
Applied, thanks. Is there any plan in place for bringing the DaVinci tree into sync with mainline here? It'd help avoid issues like this in future.
Quoted 11 lines · Mark Brown
Quoted 5 lines · Kevin Hilman
This patch is against DaVinci git[1], which still has some differences compared to the upstream trees.
Below is a version of this patch against Linus' tree, with the SFFSDR board changes from Hugo included.
Applied, thanks. Is there any plan in place for bringing the DaVinci tree into sync with mainline here? It'd help avoid issues like this in future.
Yes, I am actively working on that. However, I'm currently focusing on the core arch/arm/mach-davinci/* code first, then will work on bringing the rest of the drivers up to speed.
Kevin
Quoted 20 lines · On Fri, 13 Feb 2009 12:39:39 +0530 [email protected] wrote:
From: Chaithrika U S <[email protected]>
Fix for the error when the audio module is unloaded.
On unregistering theplatform_device,platform_device_releasewill free the platform data.If platform data is static the kernel panics when it is freed. Instead use the platform device helper function to add data.This change has been tested on DM644x EVM.
Signed-off-by Chaithrika U S <[email protected]>--- sound/soc/davinci/davinci-evm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)(quoted diff) +0
-0
b/sound/soc/davinci/davinci-evm.cindex 1aad262..95c44bf 100644
sound/soc/davinci/davinci-evm.c static int __init evm_init(void) · line 228
Quoted 5 lines
sound/soc/davinci/davinci-evm.c +1
-1@@ -225,7 +225,7 @@ static int __init evm_init(void)platform_set_drvdata (evm_snd_device, &evm_snd_devdata); evm_snd_devdata.dev = &evm_snd_device->dev; - evm_snd_device->dev.platform_data = data; +platform_device_add_data (evm_snd_device, data,sizeof (data));
Hi,
I modified your patch for the SFFSDR board and it also fixed the problem. Thank-you.
Can you include the fix for the SFFSDR also in your patch? Here is the modification for the SFFSDR:
(quoted diff) +0 -0
b/sound/soc/davinci/davinci-sffsdr.c index a304ada..6e46258 100644
sound/soc/davinci/davinci-sffsdr.c +1 -1
@@ -128,7 +128,7 @@ static int __init sffsdr_init(void)platform_set_drvdata (sffsdr_snd_device, &sffsdr_snd_devdata); sffsdr_snd_devdata.dev = &sffsdr_snd_device->dev; - sffsdr_snd_device->dev.platform_data = &sffsdr_snd_data; + platform_device_add_data(sffsdr_snd_device, &sffsdr_snd_data,
sizeof(sffsdr_snd_data));
ret = platform_device_add_resources(sffsdr_snd_device,
sffsdr_snd_resources,
Quoted 41 lines · Hugo Villeneuve
Quoted 20 lines · On Fri, 13 Feb 2009 12:39:39 +0530 [email protected] wrote:
From: Chaithrika U S <[email protected]>
Fix for the error when the audio module is unloaded.
On unregistering theplatform_device,platform_device_releasewill free the platform data.If platform data is static the kernel panics when it is freed. Instead use the platform device helper function to add data.This change has been tested on DM644x EVM.
Signed-off-by Chaithrika U S <[email protected]>--- sound/soc/davinci/davinci-evm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)(quoted diff) +0
-0
b/sound/soc/davinci/davinci-evm.cindex 1aad262..95c44bf 100644sound/soc/davinci/davinci-evm.c static int __init evm_init(void) · line 228
Quoted 5 lines
sound/soc/davinci/davinci-evm.c +1
-1@@ -225,7 +225,7 @@ static int __init evm_init(void)platform_set_drvdata (evm_snd_device, &evm_snd_devdata); evm_snd_devdata.dev = &evm_snd_device->dev; - evm_snd_device->dev.platform_data = data; +platform_device_add_data (evm_snd_device, data,sizeof (data));Hi,
I modified your patch for the SFFSDR board and it also fixed the problem. Thank-you.Can you include the fix for the SFFSDR also in your patch? Here is the modification for the SFFSDR:
(quoted diff) +0
-0
b/sound/soc/davinci/davinci-sffsdr.cindex a304ada..6e46258 100644
sound/soc/davinci/davinci-sffsdr.c static int __init sffsdr_init(void) · line 134
Quoted 8 lines
sound/soc/davinci/davinci-sffsdr.c +1
-1@@ -128,7 +128,7 @@ static int __init sffsdr_init(void)platform_set_drvdata (sffsdr_snd_device, &sffsdr_snd_devdata); sffsdr_snd_devdata.dev = &sffsdr_snd_device->dev; - sffsdr_snd_device->dev.platform_data = &sffsdr_snd_data; +platform_device_add_data (sffsdr_snd_device, &sffsdr_snd_data,sizeof (sffsdr_snd_data)); ret = platform_device_add_resources(sffsdr_snd_device,
Hugo,
I will fold your change into Chaithrika's original patch.
Thanks,
Kevin