From 7f97653ea020784bf98733134f36cd477c243f2a Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 8 Nov 2012 14:36:18 +0100
Subject: [PATCH] --- yaml --- r: 335517 b: refs/heads/master c:
 8bb4d9ce08b0a92ca174e41d92c180328f86173f h: refs/heads/master i:   335515:
 9b942145ec0874e8d47373b38b769f88faa6ed83 v: v3

---
 [refs]                           | 2 +-
 trunk/sound/core/oss/mixer_oss.c | 1 +
 trunk/sound/core/oss/pcm_oss.c   | 1 +
 trunk/sound/core/pcm_native.c    | 6 ++++--
 trunk/sound/core/sound.c         | 2 +-
 trunk/sound/core/sound_oss.c     | 2 +-
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 4eab67216bb9..ab0b9cc934bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 19a62823eae453619604636082085812c14ee391
+refs/heads/master: 8bb4d9ce08b0a92ca174e41d92c180328f86173f
diff --git a/trunk/sound/core/oss/mixer_oss.c b/trunk/sound/core/oss/mixer_oss.c
index a9a2e63c0222..e8a1d18774b2 100644
--- a/trunk/sound/core/oss/mixer_oss.c
+++ b/trunk/sound/core/oss/mixer_oss.c
@@ -76,6 +76,7 @@ static int snd_mixer_oss_open(struct inode *inode, struct file *file)
 		snd_card_unref(card);
 		return -EFAULT;
 	}
+	snd_card_unref(card);
 	return 0;
 }
 
diff --git a/trunk/sound/core/oss/pcm_oss.c b/trunk/sound/core/oss/pcm_oss.c
index f337b66a020b..4c1cc51772e6 100644
--- a/trunk/sound/core/oss/pcm_oss.c
+++ b/trunk/sound/core/oss/pcm_oss.c
@@ -2454,6 +2454,7 @@ static int snd_pcm_oss_open(struct inode *inode, struct file *file)
 	mutex_unlock(&pcm->open_mutex);
 	if (err < 0)
 		goto __error;
+	snd_card_unref(pcm->card);
 	return err;
 
       __error:
diff --git a/trunk/sound/core/pcm_native.c b/trunk/sound/core/pcm_native.c
index 6e8872de5ba0..f9ddecf2f4cd 100644
--- a/trunk/sound/core/pcm_native.c
+++ b/trunk/sound/core/pcm_native.c
@@ -2122,7 +2122,8 @@ static int snd_pcm_playback_open(struct inode *inode, struct file *file)
 	pcm = snd_lookup_minor_data(iminor(inode),
 				    SNDRV_DEVICE_TYPE_PCM_PLAYBACK);
 	err = snd_pcm_open(file, pcm, SNDRV_PCM_STREAM_PLAYBACK);
-	snd_card_unref(pcm->card);
+	if (pcm)
+		snd_card_unref(pcm->card);
 	return err;
 }
 
@@ -2135,7 +2136,8 @@ static int snd_pcm_capture_open(struct inode *inode, struct file *file)
 	pcm = snd_lookup_minor_data(iminor(inode),
 				    SNDRV_DEVICE_TYPE_PCM_CAPTURE);
 	err = snd_pcm_open(file, pcm, SNDRV_PCM_STREAM_CAPTURE);
-	snd_card_unref(pcm->card);
+	if (pcm)
+		snd_card_unref(pcm->card);
 	return err;
 }
 
diff --git a/trunk/sound/core/sound.c b/trunk/sound/core/sound.c
index 89780c323f19..70ccdab74153 100644
--- a/trunk/sound/core/sound.c
+++ b/trunk/sound/core/sound.c
@@ -114,7 +114,7 @@ void *snd_lookup_minor_data(unsigned int minor, int type)
 	mreg = snd_minors[minor];
 	if (mreg && mreg->type == type) {
 		private_data = mreg->private_data;
-		if (mreg->card_ptr)
+		if (private_data && mreg->card_ptr)
 			atomic_inc(&mreg->card_ptr->refcount);
 	} else
 		private_data = NULL;
diff --git a/trunk/sound/core/sound_oss.c b/trunk/sound/core/sound_oss.c
index e1d79ee35906..726a49ac9725 100644
--- a/trunk/sound/core/sound_oss.c
+++ b/trunk/sound/core/sound_oss.c
@@ -54,7 +54,7 @@ void *snd_lookup_oss_minor_data(unsigned int minor, int type)
 	mreg = snd_oss_minors[minor];
 	if (mreg && mreg->type == type) {
 		private_data = mreg->private_data;
-		if (mreg->card_ptr)
+		if (private_data && mreg->card_ptr)
 			atomic_inc(&mreg->card_ptr->refcount);
 	} else
 		private_data = NULL;