From 7abf6efb50d5778a7ef05656af7e5081b84de2e0 Mon Sep 17 00:00:00 2001
From: Ian Abbott <abbotti@mev.co.uk>
Date: Mon, 9 Feb 2009 16:51:38 +0000
Subject: [PATCH] --- yaml --- r: 141471 b: refs/heads/master c:
 979200719d35934367bbf97d9b7d22d5b5281dda h: refs/heads/master i:   141469:
 9d248ff1c18c082d2113b89646f620f1a5b3f724   141467:
 7af5a813398de926a1923ab74dd4f511739e3eb9   141463:
 b3c96eff142b0f932663d1da0962b95419f8dce2   141455:
 b56469e8998af4cb5ef248f5286065fe314fe1ad   141439:
 c2d9fe7a422657297de249b078fbf66debba05de v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/staging/comedi/comedi_fops.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f541ccffcd2f..fecbfb90af5b 100644
--- 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
index 6867b0938e15..fa5ef2ee4eda 100644
--- 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;