mirror of
https://github.com/followmsi/android_kernel_google_msm.git
synced 2024-11-06 23:17:41 +00:00
ALSA: pcsp: Fix the order of input device unregistration
commit 6408eac266
upstream.
The current code may access to the already freed object. The input
device must be accessed and unregistered before freeing the top level
sound object.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Cc: Weng Meiling <wengmeiling.weng@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
a8d5c053a4
commit
296d59e61f
1 changed files with 1 additions and 1 deletions
|
@ -187,8 +187,8 @@ static int __devinit pcsp_probe(struct platform_device *dev)
|
||||||
static int __devexit pcsp_remove(struct platform_device *dev)
|
static int __devexit pcsp_remove(struct platform_device *dev)
|
||||||
{
|
{
|
||||||
struct snd_pcsp *chip = platform_get_drvdata(dev);
|
struct snd_pcsp *chip = platform_get_drvdata(dev);
|
||||||
alsa_card_pcsp_exit(chip);
|
|
||||||
pcspkr_input_remove(chip->input_dev);
|
pcspkr_input_remove(chip->input_dev);
|
||||||
|
alsa_card_pcsp_exit(chip);
|
||||||
platform_set_drvdata(dev, NULL);
|
platform_set_drvdata(dev, NULL);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue