From ff9ee6ba62c267495da50f5117c6ee074c3a9571 Mon Sep 17 00:00:00 2001
From: Mike Isely <isely@pobox.com>
Date: Tue, 22 Apr 2008 14:45:39 -0300
Subject: [PATCH] --- yaml --- r: 92441 b: refs/heads/master c:
 99a6acf9a7a80da49e85be964b15ffed9ab7643e h: refs/heads/master i:   92439:
 fed87b40ef0596d23b6ec6e518b3f32702b2bd60 v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/media/video/pvrusb2/pvrusb2-context.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bb005c783259..c105209b21b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f421fe475726f0de55588a22c870e5cf35dc4f5
+refs/heads/master: 99a6acf9a7a80da49e85be964b15ffed9ab7643e
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-context.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-context.c
index 160437b21e6d..2a6726e403f0 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-context.c
+++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-context.c
@@ -173,7 +173,7 @@ int pvr2_channel_claim_stream(struct pvr2_channel *cp,
 	int code = 0;
 	pvr2_context_enter(cp->mc_head); do {
 		if (sp == cp->stream) break;
-		if (sp->user) {
+		if (sp && sp->user) {
 			code = -EBUSY;
 			break;
 		}