diff options
| author | Paul Bolle <pebolle@tiscali.nl> | 2014-05-26 21:09:10 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-26 20:19:27 -0700 |
| commit | f30f2c2d417b9de3d967016ade0bea2d93190624 (patch) | |
| tree | 27535152d064b0547e115029c79004e1278b076e /drivers/staging | |
| parent | 464ae880a3caa0128a7d0e6c91e3d96afc2da6f0 (diff) | |
staging: comedi: remove check for CONFIG_KMOD
The comedi driver was added in v2.6.29. That's the same release that
removed the Kconfig symbol KMOD. So the code behind a test for its
macro has been hidden since it was in staging. Remove it.
Remove a useless assignment to "dev->in_request_module" too. That
variable seems pointless anyhow, but that's a different issue.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/comedi/comedi_fops.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index 012c8fd1aabb..70ad00c501ef 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c @@ -2351,14 +2351,6 @@ static int comedi_open(struct inode *inode, struct file *file) if (capable(CAP_NET_ADMIN) && dev->in_request_module) goto ok; - dev->in_request_module = true; - -#ifdef CONFIG_KMOD - mutex_unlock(&dev->mutex); - request_module("char-major-%i-%i", COMEDI_MAJOR, dev->minor); - mutex_lock(&dev->mutex); -#endif - dev->in_request_module = false; if (!dev->attached && !capable(CAP_NET_ADMIN)) { |