Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 186857
b: refs/heads/master
c: a917d4c
h: refs/heads/master
i:
  186855: d6294e4
v: v3
  • Loading branch information
Chihau Chau authored and Greg Kroah-Hartman committed Mar 4, 2010
1 parent 43dd8d3 commit 3969004
Show file tree
Hide file tree
Showing 2 changed files with 5 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: d4023a5ee2f683f57636346c0baf94cda710055a
refs/heads/master: a917d4c4251314afc196fd7a7d9d10faff2effda
9 changes: 4 additions & 5 deletions trunk/drivers/staging/comedi/drivers/poc.c
Original file line number Diff line number Diff line change
Expand Up @@ -122,22 +122,21 @@ static int poc_attach(struct comedi_device *dev, struct comedi_devconfig *it)
unsigned int iosize;

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

dev->board_name = this_board->name;

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

iosize = this_board->iosize;
/* check if io addresses are available */
if (!request_region(iobase, iosize, "dac02")) {
printk
("I/O port conflict: failed to allocate ports 0x%lx to "
"0x%lx\n", iobase, iobase + iosize - 1);
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;
Expand Down

0 comments on commit 3969004

Please sign in to comment.