diff --git a/[refs] b/[refs] index d6046dedcb6a..6a7d7cf2b8bf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d4fec101b628164c2a731d97fb874309b21abf67 +refs/heads/master: f2c8042276338f1f40ccb9e5bef77887cdb626f4 diff --git a/trunk/drivers/staging/comedi/drivers/aio_aio12_8.c b/trunk/drivers/staging/comedi/drivers/aio_aio12_8.c index 46ef41a6e6ff..c07de3e00e48 100644 --- a/trunk/drivers/staging/comedi/drivers/aio_aio12_8.c +++ b/trunk/drivers/staging/comedi/drivers/aio_aio12_8.c @@ -206,7 +206,7 @@ static int aio_aio12_8_attach(struct comedi_device *dev, dev->board_name = board->name; iobase = it->options[0]; - if (!request_region(iobase, 24, dev->board_name)) { + if (!request_region(iobase, 32, dev->board_name)) { printk(KERN_ERR "I/O port conflict"); return -EIO; }