Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[mv-sheeva.git] / drivers / staging / comedi / drivers / comedi_bond.c

diff --git a/drivers/staging/comedi/drivers/comedi_bond.c b/drivers/staging/comedi/drivers/comedi_bond.c
index cf39a24ddd4cdc91dffa2302a78846e703b18651..41311d99473b89937a2c4964fb009e58114502cb 100644 (file)
--- a/drivers/staging/comedi/drivers/comedi_bond.c
+++ b/drivers/staging/comedi/drivers/comedi_bond.c
@@ -90,6 +90,7 @@ Configuration Options:
 #include "../comedilib.h"
 #include "../comedidev.h"
 #include <linux/string.h>
+#include <linux/slab.h>
 
 /* The maxiumum number of channels per subdevice. */
 #define MAX_CHANS 256
@@ -417,7 +418,7 @@ static int doDevConfig(struct comedi_device *dev, struct comedi_devconfig *it)
                int sdev = -1, nchans, tmp;
                struct BondedDevice *bdev = NULL;
 
-               if (minor < 0 || minor > COMEDI_NUM_BOARD_MINORS) {
+               if (minor < 0 || minor >= COMEDI_NUM_BOARD_MINORS) {
                        ERROR("Minor %d is invalid!\n", minor);
                        return 0;
                }