|
|
@@ -120,12 +120,8 @@ static void comedi_device_cleanup(struct comedi_device *dev)
|
|
|
if (dev->attached)
|
|
|
driver_module = dev->driver->module;
|
|
|
comedi_device_detach(dev);
|
|
|
- while (dev->use_count > 0) {
|
|
|
- if (driver_module)
|
|
|
- module_put(driver_module);
|
|
|
- module_put(THIS_MODULE);
|
|
|
- dev->use_count--;
|
|
|
- }
|
|
|
+ if (driver_module && dev->use_count)
|
|
|
+ module_put(driver_module);
|
|
|
mutex_unlock(&dev->mutex);
|
|
|
}
|
|
|
|
|
|
@@ -2356,22 +2352,17 @@ static int comedi_open(struct inode *inode, struct file *file)
|
|
|
goto out;
|
|
|
}
|
|
|
ok:
|
|
|
- __module_get(THIS_MODULE);
|
|
|
-
|
|
|
- if (dev->attached) {
|
|
|
+ if (dev->attached && dev->use_count == 0) {
|
|
|
if (!try_module_get(dev->driver->module)) {
|
|
|
- module_put(THIS_MODULE);
|
|
|
rc = -ENOSYS;
|
|
|
goto out;
|
|
|
}
|
|
|
- }
|
|
|
-
|
|
|
- if (dev->attached && dev->use_count == 0 && dev->open) {
|
|
|
- rc = dev->open(dev);
|
|
|
- if (rc < 0) {
|
|
|
- module_put(dev->driver->module);
|
|
|
- module_put(THIS_MODULE);
|
|
|
- goto out;
|
|
|
+ if (dev->open) {
|
|
|
+ rc = dev->open(dev);
|
|
|
+ if (rc < 0) {
|
|
|
+ module_put(dev->driver->module);
|
|
|
+ goto out;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -2411,12 +2402,11 @@ static int comedi_close(struct inode *inode, struct file *file)
|
|
|
s->lock = NULL;
|
|
|
}
|
|
|
}
|
|
|
- if (dev->attached && dev->use_count == 1 && dev->close)
|
|
|
- dev->close(dev);
|
|
|
-
|
|
|
- module_put(THIS_MODULE);
|
|
|
- if (dev->attached)
|
|
|
+ if (dev->attached && dev->use_count == 1) {
|
|
|
+ if (dev->close)
|
|
|
+ dev->close(dev);
|
|
|
module_put(dev->driver->module);
|
|
|
+ }
|
|
|
|
|
|
dev->use_count--;
|
|
|
|