Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141470
b: refs/heads/master
c: 56d92c6
h: refs/heads/master
v: v3
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 9d248ff commit b7a1ab1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1b9f64120571d99a81c74092bdbe828303e55adb
refs/heads/master: 56d92c60e6dc708541711e9de4993e7d527d08e8
4 changes: 1 addition & 3 deletions trunk/drivers/staging/comedi/comedi_fops.c
Original file line number Diff line number Diff line change
Expand Up @@ -1757,7 +1757,6 @@ void do_become_nonbusy(comedi_device *dev, comedi_subdevice *s)

static int comedi_open(struct inode *inode, struct file *file)
{
char mod[32];
const unsigned minor = iminor(inode);
struct comedi_device_file_info *dev_file_info =
comedi_get_device_file_info(minor);
Expand Down Expand Up @@ -1793,10 +1792,9 @@ static int comedi_open(struct inode *inode, struct file *file)

dev->in_request_module = 1;

sprintf(mod, "char-major-%i-%i", COMEDI_MAJOR, dev->minor);
#ifdef CONFIG_KMOD
mutex_unlock(&dev->mutex);
request_module(mod);
request_module("char-major-%i-%i", COMEDI_MAJOR, dev->minor);
mutex_lock(&dev->mutex);
#endif

Expand Down

0 comments on commit b7a1ab1

Please sign in to comment.