diff options
| -rw-r--r-- | drivers/staging/comedi/comedi_fops.c | 7 | ||||
| -rw-r--r-- | drivers/staging/comedi/comedi_internal.h | 2 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers.c | 7 |
3 files changed, 6 insertions, 10 deletions
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index 8b5fa2fc9a82..ce050e4ba107 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c @@ -2348,7 +2348,7 @@ void comedi_free_board_minor(unsigned minor) comedi_free_board_file_info(comedi_clear_minor(minor)); } -int comedi_find_board_minor(struct device *hardware_device) +void comedi_release_hardware_device(struct device *hardware_device) { int minor; struct comedi_file_info *info; @@ -2357,12 +2357,13 @@ int comedi_find_board_minor(struct device *hardware_device) spin_lock(&comedi_file_info_table_lock); info = comedi_file_info_table[minor]; if (info && info->hardware_device == hardware_device) { + comedi_file_info_table[minor] = NULL; spin_unlock(&comedi_file_info_table_lock); - return minor; + comedi_free_board_file_info(info); + break; } spin_unlock(&comedi_file_info_table_lock); } - return -ENODEV; } int comedi_alloc_subdevice_minor(struct comedi_subdevice *s) diff --git a/drivers/staging/comedi/comedi_internal.h b/drivers/staging/comedi/comedi_internal.h index b3743135f4aa..fd14de662e8f 100644 --- a/drivers/staging/comedi/comedi_internal.h +++ b/drivers/staging/comedi/comedi_internal.h @@ -10,7 +10,7 @@ int do_rangeinfo_ioctl(struct comedi_device *dev, struct comedi_rangeinfo __user *arg); int comedi_alloc_board_minor(struct device *hardware_device); void comedi_free_board_minor(unsigned minor); -int comedi_find_board_minor(struct device *hardware_device); +void comedi_release_hardware_device(struct device *hardware_device); int comedi_alloc_subdevice_minor(struct comedi_subdevice *s); void comedi_free_subdevice_minor(struct comedi_subdevice *s); diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c index 4460814d5344..29c8f5037065 100644 --- a/drivers/staging/comedi/drivers.c +++ b/drivers/staging/comedi/drivers.c @@ -459,14 +459,9 @@ EXPORT_SYMBOL_GPL(comedi_auto_config); void comedi_auto_unconfig(struct device *hardware_device) { - int minor; - if (hardware_device == NULL) return; - minor = comedi_find_board_minor(hardware_device); - if (minor < 0) - return; - comedi_free_board_minor(minor); + comedi_release_hardware_device(hardware_device); } EXPORT_SYMBOL_GPL(comedi_auto_unconfig); |