Staging: comedi: comedi_open: Fix null pointer dereference.

[net-next-2.6.git] / drivers / staging / comedi / comedi_fops.c

diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index 6867b0938e150d4f1ae21fc017344bbd813b2e02..fa5ef2ee4edafb7e12f71fb2b96a64d058f448b6 100644 (file)
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -1760,7 +1760,8 @@ static int comedi_open(struct inode *inode, struct file *file)
        const unsigned minor = iminor(inode);
        struct comedi_device_file_info *dev_file_info =
            comedi_get_device_file_info(minor);
-       comedi_device *dev = dev_file_info->device;
+       comedi_device *dev = dev_file_info ? dev_file_info->device : NULL;
+
        if (dev == NULL) {
                DPRINTK("invalid minor number\n");
                return -ENODEV;