summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorKarsten Wiese <annabellesgarden@yahoo.de>2006-10-16 14:45:14 +0200
committerChris Wright <chrisw@sous-sol.org>2006-11-03 17:33:45 -0800
commit0e98aebf2acaa92ca16bf2968b85b3c19da35dc3 (patch)
treefa49df1cccfde39c899f4c11bf8f6e4924eac060 /sound
parente0cd3e38de139be4929fe8b18d85da585580420b (diff)
[PATCH] ALSA: Fix bug in snd-usb-usx2y's usX2Y_pcms_lock_check()
Fix bug in snd-usb-usx2y's usX2Y_pcms_lock_check() substream can be NULL...... in mainline, bug was introduced by: 2006-06-22 [ALSA] Add O_APPEND flag support to PCM From: Karsten Wiese <annabellesgarden@yahoo.de> Signed-off-by: Karsten Wiese <annabellesgarden@yahoo.de> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/usb/usx2y/usx2yhwdeppcm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/usx2y/usx2yhwdeppcm.c b/sound/usb/usx2y/usx2yhwdeppcm.c
index 88b72b52590f..605ac5bb9255 100644
--- a/sound/usb/usx2y/usx2yhwdeppcm.c
+++ b/sound/usb/usx2y/usx2yhwdeppcm.c
@@ -632,7 +632,7 @@ static int usX2Y_pcms_lock_check(struct snd_card *card)
for (s = 0; s < 2; ++s) {
struct snd_pcm_substream *substream;
substream = pcm->streams[s].substream;
- if (SUBSTREAM_BUSY(substream))
+ if (substream && SUBSTREAM_BUSY(substream))
err = -EBUSY;
}
}