From 7af5a813398de926a1923ab74dd4f511739e3eb9 Mon Sep 17 00:00:00 2001 From: Frank Mori Hess Date: Mon, 15 Dec 2008 13:48:47 +0000 Subject: [PATCH] --- yaml --- r: 141467 b: refs/heads/master c: 53b670a75bef4bf6484bbf6ca6a896c365676fd4 h: refs/heads/master i: 141465: abce3bd6204a88d1aef42e6186c311573042eee2 141463: b3c96eff142b0f932663d1da0962b95419f8dce2 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedi_fops.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c133b1213aa1..2e674cf099f5 100644 --- 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 index 1464f550a5af..fbd3d1c6c647 100644 --- 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