---

yaml --- r: 141467 b: refs/heads/master c: 53b670a h: refs/heads/master i: 141465: abce3bd 141463: b3c96ef v: v3
git-mirror · Apr 3, 2009 · 7af5a81 · 7af5a81
1 parent 978f604
commit 7af5a81
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3cb729ef4a192f04179f780122df78ef1ffe779
+refs/heads/master: 53b670a75bef4bf6484bbf6ca6a896c365676fd4
diff --git a/trunk/drivers/staging/comedi/comedi_fops.c b/trunk/drivers/staging/comedi/comedi_fops.c
@@ -104,9 +104,13 @@ static int comedi_ioctl(struct inode *inode, struct file *file,
 	const unsigned minor = iminor(file->f_dentry->d_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;
 	int rc;
 
+	if (dev_file_info == NULL || dev_file_info->device == NULL)
+		return -ENODEV;
+	dev = dev_file_info->device;
+
 	mutex_lock(&dev->mutex);
 
 	/* Device config is special, because it must work on