Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 364083
b: refs/heads/master
c: 07e6ed0
h: refs/heads/master
i:
  364081: 9206e62
  364079: 050b497
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Apr 11, 2013
1 parent c2ededb commit 4b1f4de
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 20 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: 7ba25510ca88bed86e0e1e2537ae914e837afa99
refs/heads/master: 07e6ed00b15f7c7fd856857e5edf4d890c3a94e9
22 changes: 3 additions & 19 deletions trunk/drivers/staging/comedi/drivers/poc.c
Original file line number Diff line number Diff line change
Expand Up @@ -139,27 +139,11 @@ static int poc_attach(struct comedi_device *dev, struct comedi_devconfig *it)
const struct boarddef_struct *board = comedi_board(dev);
struct poc_private *devpriv;
struct comedi_subdevice *s;
unsigned long iobase;
unsigned int iosize;
int ret;

iobase = it->options[0];
printk(KERN_INFO "comedi%d: poc: using %s iobase 0x%lx\n", dev->minor,
board->name, iobase);

if (iobase == 0) {
printk(KERN_ERR "io base address required\n");
return -EINVAL;
}

iosize = board->iosize;
/* check if io addresses are available */
if (!request_region(iobase, iosize, dev->board_name)) {
printk(KERN_ERR "I/O port conflict: failed to allocate ports "
"0x%lx to 0x%lx\n", iobase, iobase + iosize - 1);
return -EIO;
}
dev->iobase = iobase;
ret = comedi_request_region(dev, it->options[0], board->iosize);
if (ret)
return ret;

ret = comedi_alloc_subdevices(dev, 1);
if (ret)
Expand Down

0 comments on commit 4b1f4de

Please sign in to comment.