]> err.no Git - linux-2.6/commitdiff
[ALSA] Fix bug in snd-usb-usx2y's usX2Y_pcms_lock_check()
authorKarsten Wiese <annabellesgarden@yahoo.de>
Wed, 4 Oct 2006 15:16:46 +0000 (17:16 +0200)
committerJaroslav Kysela <perex@suse.cz>
Fri, 6 Oct 2006 18:23:01 +0000 (20:23 +0200)
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

Signed-off-by: Karsten Wiese <annabellesgarden@yahoo.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
sound/usb/usx2y/usx2yhwdeppcm.c

index 9acef9d9054376d9e1c5d0f2c93ac7803802dc3e..20708d2ffb6a35d7046bb725f43c9f1511d89c01 100644 (file)
@@ -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;
                }
        }