Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 175078
b: refs/heads/master
c: 0dfd69b
h: refs/heads/master
v: v3
  • Loading branch information
Bruce Jones authored and Greg Kroah-Hartman committed Dec 11, 2009
1 parent f362cb5 commit 786ea03
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: 2829db3eecf54ac32a870617742ebfeb1a515f43
refs/heads/master: 0dfd69bfdbf9de7021e81443c0c195f7da208a7d
9 changes: 4 additions & 5 deletions trunk/drivers/staging/comedi/drivers/acl7225b.c
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,11 @@ static int acl7225b_attach(struct comedi_device *dev,

iobase = it->options[0];
iorange = this_board->io_range;
printk("comedi%d: acl7225b: board=%s 0x%04x ", dev->minor,
printk(KERN_INFO "comedi%d: acl7225b: board=%s 0x%04x\n", dev->minor,
this_board->name, iobase);
if (!request_region(iobase, iorange, "acl7225b")) {
printk("I/O port conflict\n");
printk(KERN_ERR "comedi%d: request_region failed - I/O port conflict\n",
dev->minor);
return -EIO;
}
dev->board_name = this_board->name;
Expand Down Expand Up @@ -137,14 +138,12 @@ static int acl7225b_attach(struct comedi_device *dev,
s->range_table = &range_digital;
s->private = (void *)ACL7225_DI_LO;

printk("\n");

return 0;
}

static int acl7225b_detach(struct comedi_device *dev)
{
printk("comedi%d: acl7225b: remove\n", dev->minor);
printk(KERN_INFO "comedi%d: acl7225b: remove\n", dev->minor);

if (dev->iobase)
release_region(dev->iobase, this_board->io_range);
Expand Down

0 comments on commit 786ea03

Please sign in to comment.