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;
 		}