summaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorMike Isely <isely@pobox.com>2008-04-22 19:45:39 +0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-24 19:07:47 +0200
commit99a6acf9a7a80da49e85be964b15ffed9ab7643e (patch)
tree2ca3444f88dac31ef413e772287144da946d5e80 /drivers/media/video
parentV4L/DVB (7305): pvrusb2: whitespace fixup (diff)
downloadlinux-99a6acf9a7a80da49e85be964b15ffed9ab7643e.tar.xz
linux-99a6acf9a7a80da49e85be964b15ffed9ab7643e.zip
V4L/DVB (7306): pvrusb2: Fix oops possible when claiming a NULL stream
Signed-off-by: Mike Isely <isely@pobox.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-context.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-context.c b/drivers/media/video/pvrusb2/pvrusb2-context.c
index 160437b21e6d..2a6726e403f0 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-context.c
+++ b/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;
}