Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 363995
b: refs/heads/master
c: 62d4d56
h: refs/heads/master
i:
  363993: 50d06be
  363991: b0182b6
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Apr 9, 2013
1 parent 19d9ffe commit ef52962
Show file tree
Hide file tree
Showing 2 changed files with 3 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: f20156819fd695dde50985443b93fae11df1dd4e
refs/heads/master: 62d4d5613d8b4c35555ef338ac27c3df1e36e4b4
12 changes: 2 additions & 10 deletions trunk/drivers/staging/comedi/drivers/rti800.c
Original file line number Diff line number Diff line change
Expand Up @@ -309,11 +309,8 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
struct comedi_subdevice *s;

iobase = it->options[0];
printk(KERN_INFO "comedi%d: rti800: 0x%04lx\n", dev->minor, iobase);
if (!request_region(iobase, RTI800_SIZE, "rti800")) {
printk(KERN_WARNING "I/O port conflict\n");
if (!request_region(iobase, RTI800_SIZE, "rti800"))
return -EIO;
}
dev->iobase = iobase;

outb(0, dev->iobase + RTI800_CSR);
Expand All @@ -322,15 +319,10 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it)

irq = it->options[1];
if (irq) {
printk(KERN_INFO "( irq = %u )\n", irq);
ret = request_irq(irq, rti800_interrupt, 0, "rti800", dev);
if (ret < 0) {
printk(KERN_WARNING " Failed to allocate IRQ\n");
if (ret < 0)
return ret;
}
dev->irq = irq;
} else {
printk(KERN_INFO "( no irq )\n");
}

dev->board_name = board->name;
Expand Down

0 comments on commit ef52962

Please sign in to comment.