From c16a9efe7b64a145ed80358007c91fad3f4c4086 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Thu, 4 Apr 2013 14:59:03 +0100 Subject: [PATCH] --- yaml --- r: 363916 b: refs/heads/master c: 8907cf6c5da2bb6d877c8ba59f90aff1b72cd814 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedi_fops.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c6d69cc3daf1..6d9a4dc373fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eda56825d582901b6a1c36fb8d754a3ebee0388c +refs/heads/master: 8907cf6c5da2bb6d877c8ba59f90aff1b72cd814 diff --git a/trunk/drivers/staging/comedi/comedi_fops.c b/trunk/drivers/staging/comedi/comedi_fops.c index e69e9d453433..c99b28943c7d 100644 --- a/trunk/drivers/staging/comedi/comedi_fops.c +++ b/trunk/drivers/staging/comedi/comedi_fops.c @@ -50,7 +50,6 @@ #include "comedi_internal.h" #define COMEDI_NUM_MINORS 0x100 -#define COMEDI_FIRST_SUBDEVICE_MINOR COMEDI_NUM_BOARD_MINORS #ifdef CONFIG_COMEDI_DEBUG int comedi_debug; @@ -2400,7 +2399,7 @@ int comedi_alloc_subdevice_minor(struct comedi_subdevice *s) if (s->subdev_flags & SDF_CMD_WRITE) info->write_subdevice = s; mutex_lock(&comedi_file_info_table_lock); - for (i = COMEDI_FIRST_SUBDEVICE_MINOR; i < COMEDI_NUM_MINORS; ++i) { + for (i = COMEDI_NUM_BOARD_MINORS; i < COMEDI_NUM_MINORS; ++i) { if (comedi_file_info_table[i] == NULL) { comedi_file_info_table[i] = info; break; @@ -2433,7 +2432,7 @@ void comedi_free_subdevice_minor(struct comedi_subdevice *s) return; BUG_ON(s->minor >= COMEDI_NUM_MINORS); - BUG_ON(s->minor < COMEDI_FIRST_SUBDEVICE_MINOR); + BUG_ON(s->minor < COMEDI_NUM_BOARD_MINORS); info = comedi_clear_minor(s->minor); if (s->class_dev) {