Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 363981
b: refs/heads/master
c: 894ab19
h: refs/heads/master
i:
  363979: 64095b8
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Apr 9, 2013
1 parent 4283d1e commit 1104cf9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 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: b5052511ec890ec59280de0d505456025d405798
refs/heads/master: 894ab190b9cfae1e040fd3d333528206eb0ea861
7 changes: 1 addition & 6 deletions trunk/drivers/staging/comedi/drivers/acl7225b.c
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,8 @@ static int acl7225b_attach(struct comedi_device *dev,

iobase = it->options[0];
iorange = board->io_range;
printk(KERN_INFO "comedi%d: acl7225b: board=%s 0x%04x\n", dev->minor,
board->name, iobase);
if (!request_region(iobase, iorange, "acl7225b")) {
printk(KERN_ERR "comedi%d: request_region failed - I/O port conflict\n",
dev->minor);
if (!request_region(iobase, iorange, "acl7225b"))
return -EIO;
}
dev->board_name = board->name;
dev->iobase = iobase;
dev->irq = 0;
Expand Down

0 comments on commit 1104cf9

Please sign in to comment.