summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelle Foks <jelle@foks.8m.com>2006-11-18 21:47:11 +0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-12-10 13:51:29 +0300
commit49c6b46a05ade5e1c572431844b77755527a152c (patch)
tree1f37972c85e307315cf4c79fd4d3046199798f89
parent1f683cd8bc8512c02a7d1b8358d71937d4c5134b (diff)
downloadlinux-49c6b46a05ade5e1c572431844b77755527a152c.tar.xz
V4L/DVB (4838): Fix cx88-blackbird null pointer
Allows 'debug=1' for cx88-blackbird module (dev needs to be valid for dprintk). Fixes a null-pointer dereference when using debug=1. Signed-off-by: Jelle Foks <jelle@foks.8m.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/video/cx88/cx88-blackbird.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 0037188d77d4..0cf0360588e6 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -942,9 +942,10 @@ static int mpeg_open(struct inode *inode, struct file *file)
struct cx8802_driver *drv = NULL;
int err;
+ dev = cx8802_get_device(inode);
+
dprintk( 1, "%s\n", __FUNCTION__);
- dev = cx8802_get_device(inode);
if (dev == NULL)
return -ENODEV;