From c32fcd9f3f8dcbbc47842121cdd9eb590c15ff13 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Thu, 4 Apr 2013 14:59:13 +0100 Subject: [PATCH] --- yaml --- r: 363926 b: refs/heads/master c: 0fcc9d48a0e620ee5097cbcbf8aedc5d736a01b8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedi_fops.c | 19 ++++++------------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 88b673e9322f..70e8ea6a68a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f3abc831386e3606fbb21acf0ee5231df0d0185f +refs/heads/master: 0fcc9d48a0e620ee5097cbcbf8aedc5d736a01b8 diff --git a/trunk/drivers/staging/comedi/comedi_fops.c b/trunk/drivers/staging/comedi/comedi_fops.c index 5f3b1524e07d..64721f7f089b 100644 --- a/trunk/drivers/staging/comedi/comedi_fops.c +++ b/trunk/drivers/staging/comedi/comedi_fops.c @@ -137,18 +137,6 @@ static struct comedi_file_info *comedi_clear_board_minor(unsigned minor) return info; } -static struct comedi_file_info *comedi_clear_subdevice_minor(unsigned minor) -{ - struct comedi_file_info *info; - unsigned int i = minor - COMEDI_NUM_BOARD_MINORS; - - mutex_lock(&comedi_subdevice_minor_table_lock); - info = comedi_subdevice_minor_table[i]; - comedi_subdevice_minor_table[i] = NULL; - mutex_unlock(&comedi_subdevice_minor_table_lock); - return info; -} - static void comedi_free_board_file_info(struct comedi_file_info *info) { if (info) { @@ -2528,6 +2516,7 @@ int comedi_alloc_subdevice_minor(struct comedi_subdevice *s) void comedi_free_subdevice_minor(struct comedi_subdevice *s) { struct comedi_file_info *info; + unsigned int i; if (s == NULL) return; @@ -2537,7 +2526,11 @@ void comedi_free_subdevice_minor(struct comedi_subdevice *s) BUG_ON(s->minor >= COMEDI_NUM_MINORS); BUG_ON(s->minor < COMEDI_NUM_BOARD_MINORS); - info = comedi_clear_subdevice_minor(s->minor); + i = s->minor - COMEDI_NUM_BOARD_MINORS; + mutex_lock(&comedi_subdevice_minor_table_lock); + info = comedi_subdevice_minor_table[i]; + comedi_subdevice_minor_table[i] = NULL; + mutex_unlock(&comedi_subdevice_minor_table_lock); if (s->class_dev) { device_destroy(comedi_class, MKDEV(COMEDI_MAJOR, s->minor)); s->class_dev = NULL;