From 62929687802d0b833e66725ce0b385ca3723bca9 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 9 Apr 2013 16:30:48 -0700 Subject: [PATCH] --- yaml --- r: 364086 b: refs/heads/master c: 962e5a36c718678b89939a217eb527c56d9ee8a0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/das16.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index fec50831fa99..0b2a6b8663bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e9720fd2b8fa65e4449c1d57b114dd4f6cc0a676 +refs/heads/master: 962e5a36c718678b89939a217eb527c56d9ee8a0 diff --git a/trunk/drivers/staging/comedi/drivers/das16.c b/trunk/drivers/staging/comedi/drivers/das16.c index 01fe078f3914..50902ccb5193 100644 --- a/trunk/drivers/staging/comedi/drivers/das16.c +++ b/trunk/drivers/staging/comedi/drivers/das16.c @@ -1120,13 +1120,10 @@ static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it) if (ret) return ret; /* Request an additional region for the 8255 */ - if (!request_region(dev->iobase + 0x400, board->size & 0x3ff, - dev->board_name)) { + ret = __comedi_request_region(dev, dev->iobase + 0x400, + board->size & 0x3ff); + if (ret) { release_region(dev->iobase, 0x10); - dev_warn(dev->class_dev, - "%s: I/O port conflict (%#lx,%d)\n", - dev->board_name, - dev->iobase + 0x400, board->size & 0x3ff); dev->iobase = 0; return -EIO; }