Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 364027
b: refs/heads/master
c: 99c671a
h: refs/heads/master
i:
  364025: 4e8d9ea
  364023: a224f80
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Apr 11, 2013
1 parent 0b39de2 commit ba7b346
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 13 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: 44a6438bbea4e7fcf269aca8b7de1e6b37f0b7b2
refs/heads/master: 99c671a636ad76c9a9694413c5a9c9e92545d417
15 changes: 3 additions & 12 deletions trunk/drivers/staging/comedi/drivers/pcl726.c
Original file line number Diff line number Diff line change
Expand Up @@ -225,23 +225,14 @@ static int pcl726_attach(struct comedi_device *dev, struct comedi_devconfig *it)
const struct pcl726_board *board = comedi_board(dev);
struct pcl726_private *devpriv;
struct comedi_subdevice *s;
unsigned long iobase;
unsigned int iorange;
int ret, i;
#ifdef ACL6126_IRQ
unsigned int irq;
#endif

iobase = it->options[0];
iorange = board->io_range;
printk(KERN_WARNING "comedi%d: pcl726: board=%s, 0x%03lx ", dev->minor,
board->name, iobase);
if (!request_region(iobase, iorange, dev->board_name)) {
printk(KERN_WARNING "I/O port conflict\n");
return -EIO;
}

dev->iobase = iobase;
ret = comedi_request_region(dev, it->options[0], board->io_range);
if (ret)
return ret;

devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
if (!devpriv)
Expand Down

0 comments on commit ba7b346

Please sign in to comment.