From 452f236fcf845ba95c2f984f3157493e07383792 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <m.chehab@samsung.com>
Date: Tue, 14 Jan 2014 14:49:04 -0200
Subject: em28xx-alsa: Fix error patch for init/fini

If something bad happens during init, we free the card data.
However, we still keep it initialized, causing some dependent
code to be called at .fini.

Fix it.

Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
---
 drivers/media/usb/em28xx/em28xx-audio.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'drivers')

diff --git a/drivers/media/usb/em28xx/em28xx-audio.c b/drivers/media/usb/em28xx/em28xx-audio.c
index 1563f71a5ea..45bea1adc11 100644
--- a/drivers/media/usb/em28xx/em28xx-audio.c
+++ b/drivers/media/usb/em28xx/em28xx-audio.c
@@ -948,6 +948,7 @@ urb_free:
 
 card_free:
 	snd_card_free(card);
+	adev->sndcard = NULL;
 
 	return err;
 }
@@ -966,12 +967,12 @@ static int em28xx_audio_fini(struct em28xx *dev)
 
 	em28xx_info("Closing audio extension");
 
-	snd_card_disconnect(dev->adev.sndcard);
-	flush_work(&dev->wq_trigger);
+	if (dev->adev.sndcard) {
+		snd_card_disconnect(dev->adev.sndcard);
+		flush_work(&dev->wq_trigger);
 
-	em28xx_audio_free_urb(dev);
+		em28xx_audio_free_urb(dev);
 
-	if (dev->adev.sndcard) {
 		snd_card_free(dev->adev.sndcard);
 		dev->adev.sndcard = NULL;
 	}
-- 
cgit v1.2.3-18-g5258