From b7a1ab16b1046f04c29eb8023962b6768ddbb9df Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Mon, 9 Feb 2009 16:32:12 +0000 Subject: [PATCH] --- yaml --- r: 141470 b: refs/heads/master c: 56d92c60e6dc708541711e9de4993e7d527d08e8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedi_fops.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a1e697fa7494..f541ccffcd2f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b9f64120571d99a81c74092bdbe828303e55adb +refs/heads/master: 56d92c60e6dc708541711e9de4993e7d527d08e8 diff --git a/trunk/drivers/staging/comedi/comedi_fops.c b/trunk/drivers/staging/comedi/comedi_fops.c index fbd3d1c6c647..6867b0938e15 100644 --- a/trunk/drivers/staging/comedi/comedi_fops.c +++ b/trunk/drivers/staging/comedi/comedi_fops.c @@ -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); @@ -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