---

yaml --- r: 141471 b: refs/heads/master c: 9792007 h: refs/heads/master i: 141469: 9d248ff 141467: 7af5a81 141463: b3c96ef 141455: b56469e 141439: c2d9fe7 v: v3
git-mirror · Apr 3, 2009 · 7abf6ef · 7abf6ef
1 parent b7a1ab1
commit 7abf6ef
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56d92c60e6dc708541711e9de4993e7d527d08e8
+refs/heads/master: 979200719d35934367bbf97d9b7d22d5b5281dda
diff --git a/trunk/drivers/staging/comedi/comedi_fops.c b/trunk/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;