From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 17 Nov 2005 14:59:14 +0000 (+0100)
Subject: [ALSA] pcm - NULL check in snd_pcm_suspend*()
X-Git-Tag: v2.6.16-rc1~474^2~22^2~3^2~149
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=603bf524aa4cba95e4fcd64dbfffc41f804c65ab;p=linux-2.6

[ALSA] pcm - NULL check in snd_pcm_suspend*()

Modules: PCM Midlevel

Add NULL check in snd_pcm_suspend*() so that the caller doesn't have to do it
by itself.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 263c01a70f..7bac1cbe38 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -1073,6 +1073,9 @@ int snd_pcm_suspend(struct snd_pcm_substream *substream)
 	int err;
 	unsigned long flags;
 
+	if (! substream)
+		return 0;
+
 	snd_pcm_stream_lock_irqsave(substream, flags);
 	err = snd_pcm_action(&snd_pcm_action_suspend, substream, 0);
 	snd_pcm_stream_unlock_irqrestore(substream, flags);
@@ -1091,6 +1094,9 @@ int snd_pcm_suspend_all(struct snd_pcm *pcm)
 	struct snd_pcm_substream *substream;
 	int stream, err = 0;
 
+	if (! pcm)
+		return 0;
+
 	for (stream = 0; stream < 2; stream++) {
 		for (substream = pcm->streams[stream].substream;
 		     substream; substream = substream->next) {