Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 364051
b: refs/heads/master
c: 3871a75
h: refs/heads/master
i:
  364049: f167154
  364047: 974f66c
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Apr 11, 2013
1 parent 2d44c35 commit 1bb5b51
Show file tree
Hide file tree
Showing 2 changed files with 3 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: 5e15089202709efc23f980446702df35319882c6
refs/heads/master: 3871a752ec5695d84dd9d24d55daed3b72023268
7 changes: 2 additions & 5 deletions trunk/drivers/staging/comedi/drivers/dt2811.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ Configuration options:

#include <linux/ioport.h>

static const char *driver_name = "dt2811";

static const struct comedi_lrange range_dt2811_pgh_ai_5_unipolar = {
4, {
RANGE(0, 5),
Expand Down Expand Up @@ -407,13 +405,12 @@ static int dt2811_attach(struct comedi_device *dev, struct comedi_devconfig *it)

printk(KERN_INFO "comedi%d: dt2811:base=0x%04lx\n", dev->minor, iobase);

if (!request_region(iobase, DT2811_SIZE, driver_name)) {
if (!request_region(iobase, DT2811_SIZE, dev->board_name)) {
printk(KERN_ERR "I/O port conflict\n");
return -EIO;
}

dev->iobase = iobase;
dev->board_name = board->name;

#if 0
outb(0, dev->iobase + DT2811_ADCSR);
Expand Down Expand Up @@ -449,7 +446,7 @@ static int dt2811_attach(struct comedi_device *dev, struct comedi_devconfig *it)
i = inb(dev->iobase + DT2811_ADDATHI);
printk(KERN_INFO "(irq = %d)\n", irq);
ret = request_irq(irq, dt2811_interrupt, 0,
driver_name, dev);
dev->board_name, dev);
if (ret < 0)
return -EIO;
dev->irq = irq;
Expand Down

0 comments on commit 1bb5b51

Please sign in to comment.