Merge ../linux-2.6

1 files changed, 2 insertions, 1 deletions

diff --git a/sound/core/pcm.c b/sound/core/pcm.c
index 1be470e942ef..184e74b75ba9 100644
--- a/sound/core/pcm.c
+++ b/sound/core/pcm.c
@@ -273,7 +273,8 @@ static void snd_pcm_proc_info_read(snd_pcm_substream_t *substream, snd_info_buff
         snd_pcm_info_t *info;
         int err;
 
-        snd_runtime_check(substream, return);
+        if (! substream)
+                return;
 
         info = kmalloc(sizeof(*info), GFP_KERNEL);
         if (! info) {