Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 364031
b: refs/heads/master
c: ffbe031
h: refs/heads/master
i:
  364029: eb73770
  364027: ba7b346
  364023: a224f80
  364015: 59138fe
  363999: 7ada801
  363967: d8f99b2
  363903: 49deb8c
  363775: 369bfe9
  363519: 6ef3bf2
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Apr 11, 2013
1 parent 65cdb87 commit c52d921
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 11 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: 4ab195e0cec942db8c28675b6e2f81f176d15eb9
refs/heads/master: ffbe031d25c7e53acce4b15bf06134a5370e7920
13 changes: 3 additions & 10 deletions trunk/drivers/staging/comedi/drivers/pcl812.c
Original file line number Diff line number Diff line change
Expand Up @@ -1122,22 +1122,15 @@ static int pcl812_attach(struct comedi_device *dev, struct comedi_devconfig *it)
const struct pcl812_board *board = comedi_board(dev);
struct pcl812_private *devpriv;
int ret, subdev;
unsigned long iobase;
unsigned int irq;
unsigned int dma;
unsigned long pages;
struct comedi_subdevice *s;
int n_subdevices;

iobase = it->options[0];
printk(KERN_INFO "comedi%d: pcl812: board=%s, ioport=0x%03lx",
dev->minor, board->name, iobase);

if (!request_region(iobase, board->io_range, dev->board_name)) {
printk("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 c52d921

Please sign in to comment.