Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 364028
b: refs/heads/master
c: 3f7b35c
h: refs/heads/master
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Apr 11, 2013
1 parent ba7b346 commit cffd66d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 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: 99c671a636ad76c9a9694413c5a9c9e92545d417
refs/heads/master: 3f7b35ce30b5fceddaf5d9a8f33f5dcf0985e3b3
3 changes: 1 addition & 2 deletions trunk/drivers/staging/comedi/drivers/pcl730.c
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,10 @@ static int pcl730_attach(struct comedi_device *dev, struct comedi_devconfig *it)
iorange = board->io_range;
printk(KERN_INFO "comedi%d: pcl730: board=%s 0x%04lx ", dev->minor,
board->name, iobase);
if (!request_region(iobase, iorange, "pcl730")) {
if (!request_region(iobase, iorange, dev->board_name)) {
printk("I/O port conflict\n");
return -EIO;
}
dev->board_name = board->name;
dev->iobase = iobase;
dev->irq = 0;

Expand Down

0 comments on commit cffd66d

Please sign in to comment.