Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 364085
b: refs/heads/master
c: e9720fd
h: refs/heads/master
i:
  364083: 4b1f4de
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Apr 11, 2013
1 parent 9951c1b commit e225e1b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ca8b296409c9800923fd431af15345e4da872bc0
refs/heads/master: e9720fd2b8fa65e4449c1d57b114dd4f6cc0a676
7 changes: 2 additions & 5 deletions trunk/drivers/staging/comedi/drivers/8255.c
Original file line number Diff line number Diff line change
Expand Up @@ -372,16 +372,13 @@ static int dev_8255_attach(struct comedi_device *dev,
s = &dev->subdevices[i];
iobase = it->options[i];

if (!request_region(iobase, _8255_SIZE, "8255")) {
dev_warn(dev->class_dev,
"0x%04lx (I/O port conflict)\n", iobase);

ret = __comedi_request_region(dev, iobase, _8255_SIZE);
if (ret) {
s->type = COMEDI_SUBD_UNUSED;
} else {
ret = subdev_8255_init(dev, s, NULL, iobase);
if (ret)
return ret;
dev_info(dev->class_dev, "0x%04lx\n", iobase);
}
}

Expand Down

0 comments on commit e225e1b

Please sign in to comment.