From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Takashi Iwai <tiwai@suse.de>
Cc: Kevin Hilman <khilman@deeprootsystems.com>,
Chaithrika U S <chaithrika@ti.com>,
alsa-devel@alsa-project.org,
Mark Brown <broonie@opensource.wolfsonmicro.com>
Subject: [PATCH 01/11] ASoC: Fix DaVinci module unload error
Date: Wed, 18 Feb 2009 12:02:23 +0000 [thread overview]
Message-ID: <1234958553-16049-1-git-send-email-broonie@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <20090218120135.GA15414@sirena.org.uk>
From: Kevin Hilman <khilman@deeprootsystems.com>
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.
Signed-off-by: Chaithrika U S <chaithrika@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
sound/soc/davinci/davinci-evm.c | 3 ++-
sound/soc/davinci/davinci-sffsdr.c | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c
index 54851f3..9b90b34 100644
--- a/sound/soc/davinci/davinci-evm.c
+++ b/sound/soc/davinci/davinci-evm.c
@@ -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));
diff --git a/sound/soc/davinci/davinci-sffsdr.c b/sound/soc/davinci/davinci-sffsdr.c
index 50baef1..0bf81ab 100644
--- a/sound/soc/davinci/davinci-sffsdr.c
+++ b/sound/soc/davinci/davinci-sffsdr.c
@@ -141,7 +141,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,
--
1.5.6.3
next prev parent reply other threads:[~2009-02-18 12:02 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-18 12:01 ASoC updates for 2.6.30 Mark Brown
2009-02-18 12:02 ` Mark Brown [this message]
2009-02-18 12:02 ` [PATCH 02/11] ASoC: Fix WM8753 DAIs unregistering Mark Brown
2009-02-18 12:02 ` [PATCH 03/11] ASoC: Remove version display from the WM8731 driver Mark Brown
2009-02-18 12:02 ` [PATCH 04/11] ASoC: Clean up WM8731 bias level configuration Mark Brown
2009-02-18 12:02 ` [PATCH 05/11] ASoC: Improve diagnostics for AT91SAM9G20-EK probe Mark Brown
2009-02-18 12:02 ` [PATCH 06/11] ASoC: Check machine type before loading on AT91SAM9G20-EK Mark Brown
2009-02-18 12:02 ` [PATCH 07/11] ASoC: Actively manage MCLK for AT91SAM9G20-EK Mark Brown
2009-02-18 12:02 ` [PATCH 08/11] ASoC: Rename AT91SAMG20-EK for applications Mark Brown
2009-02-18 12:02 ` [PATCH 09/11] ASoC: Shuffle WM8731 SPI and I2C device registration Mark Brown
2009-02-18 12:02 ` [PATCH 10/11] ASoC: Refactor WM8731 " Mark Brown
2009-02-18 12:02 ` [PATCH 11/11] ASoC: Remove version display from the WM8753 driver Mark Brown
2009-02-18 12:18 ` ASoC updates for 2.6.30 Takashi Iwai
2009-02-18 12:22 ` Takashi Iwai
2009-02-18 12:27 ` Takashi Iwai
2009-02-18 12:37 ` Mark Brown
2009-02-18 12:44 ` Takashi Iwai
2009-02-18 12:29 ` Mark Brown
2009-02-18 12:31 ` Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1234958553-16049-1-git-send-email-broonie@opensource.wolfsonmicro.com \
--to=broonie@opensource.wolfsonmicro.com \
--cc=alsa-devel@alsa-project.org \
--cc=chaithrika@ti.com \
--cc=khilman@deeprootsystems.com \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.