From: Takashi Iwai Date: Thu, 14 Nov 2013 14:45:12 +0000 (+0100) Subject: ALSA: pcsp: Fix the order of input device unregistration X-Git-Tag: v3.13-rc1~54^2~3 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6408eac2665955343cd0e4bcd7d6237ce39611ed;p=karo-tx-linux.git ALSA: pcsp: Fix the order of input device unregistration 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. Cc: Signed-off-by: Takashi Iwai --- diff --git a/sound/drivers/pcsp/pcsp.c b/sound/drivers/pcsp/pcsp.c index f664bae3b9b0..328bd29264ce 100644 --- a/sound/drivers/pcsp/pcsp.c +++ b/sound/drivers/pcsp/pcsp.c @@ -188,8 +188,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; }