From 9a000199f8fb76edab95494970e9d82bd8bf2b81 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 9 Apr 2013 16:19:44 -0700 Subject: [PATCH] --- yaml --- r: 364056 b: refs/heads/master c: 25829c646e11dda92a5b3628b21fe852681fec44 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/dt282x.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index bd63f3f970fb..6eff39d34f19 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6d0299000a63c617e0982baaac129a434b44cdf +refs/heads/master: 25829c646e11dda92a5b3628b21fe852681fec44 diff --git a/trunk/drivers/staging/comedi/drivers/dt282x.c b/trunk/drivers/staging/comedi/drivers/dt282x.c index 821e948839ad..19f0b999704f 100644 --- a/trunk/drivers/staging/comedi/drivers/dt282x.c +++ b/trunk/drivers/staging/comedi/drivers/dt282x.c @@ -1125,14 +1125,12 @@ static int dt282x_attach(struct comedi_device *dev, struct comedi_devconfig *it) struct comedi_subdevice *s; unsigned long iobase; - dev->board_name = board->name; - iobase = it->options[opt_iobase]; if (!iobase) iobase = 0x240; printk(KERN_INFO "comedi%d: dt282x: 0x%04lx", dev->minor, iobase); - if (!request_region(iobase, DT2821_SIZE, "dt282x")) { + if (!request_region(iobase, DT2821_SIZE, dev->board_name)) { printk(KERN_INFO " I/O port conflict\n"); return -EBUSY; } @@ -1186,7 +1184,8 @@ static int dt282x_attach(struct comedi_device *dev, struct comedi_devconfig *it) #endif if (irq > 0) { printk(KERN_INFO " ( irq = %d )", irq); - ret = request_irq(irq, dt282x_interrupt, 0, "dt282x", dev); + ret = request_irq(irq, dt282x_interrupt, 0, + dev->board_name, dev); if (ret < 0) { printk(KERN_ERR " failed to get irq\n"); return -EIO;