From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 14 Nov 2013 14:45:12 +0000 (+0100)
Subject: ALSA: pcsp: Fix the order of input device unregistration
X-Git-Tag: v3.12.2~77
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=d02c722ec36f8e107fce15e30acf4d152b15c864;p=unionfs-2.6.39.y.git

ALSA: pcsp: Fix the order of input device unregistration

commit 6408eac2665955343cd0e4bcd7d6237ce39611ed 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/sound/drivers/pcsp/pcsp.c b/sound/drivers/pcsp/pcsp.c
index 1c19cd7ad26..83b8a9a9163 100644
--- a/sound/drivers/pcsp/pcsp.c
+++ b/sound/drivers/pcsp/pcsp.c
@@ -187,8 +187,8 @@ static int pcsp_probe(struct platform_device *dev)
 static int pcsp_remove(struct platform_device *dev)
 {
 	struct snd_pcsp *chip = platform_get_drvdata(dev);
-	alsa_card_pcsp_exit(chip);
 	pcspkr_input_remove(chip->input_dev);
+	alsa_card_pcsp_exit(chip);
 	return 0;
 }