From a67873de7ef648ae118fd17ac634518947b42463 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 9 Apr 2013 16:06:31 -0700 Subject: [PATCH] --- yaml --- r: 364021 b: refs/heads/master c: 814c219a3eeb7d97046544f02b402a82917d024c h: refs/heads/master i: 364019: 3bc6481e38056f78284f107322bfb0aa11eb79d2 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/pcl711.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 771d52d9eb83..c5da2ff327ce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f375ac5f197d32aeffe5436e5864525cc14ce44a +refs/heads/master: 814c219a3eeb7d97046544f02b402a82917d024c diff --git a/trunk/drivers/staging/comedi/drivers/pcl711.c b/trunk/drivers/staging/comedi/drivers/pcl711.c index 6ee5da24a961..1a40a5e23aa0 100644 --- a/trunk/drivers/staging/comedi/drivers/pcl711.c +++ b/trunk/drivers/staging/comedi/drivers/pcl711.c @@ -459,16 +459,12 @@ static int pcl711_attach(struct comedi_device *dev, struct comedi_devconfig *it) iobase = it->options[0]; printk(KERN_INFO "comedi%d: pcl711: 0x%04lx ", dev->minor, iobase); - if (!request_region(iobase, PCL711_SIZE, "pcl711")) { + if (!request_region(iobase, PCL711_SIZE, dev->board_name)) { printk("I/O port conflict\n"); return -EIO; } dev->iobase = iobase; - /* there should be a sanity check here */ - - dev->board_name = board->name; - /* grab our IRQ */ irq = it->options[1]; if (irq > board->maxirq) { @@ -476,7 +472,8 @@ static int pcl711_attach(struct comedi_device *dev, struct comedi_devconfig *it) return -EINVAL; } if (irq) { - if (request_irq(irq, pcl711_interrupt, 0, "pcl711", dev)) { + if (request_irq(irq, pcl711_interrupt, 0, dev->board_name, + dev)) { printk(KERN_ERR "unable to allocate irq %u\n", irq); return -EINVAL; } else {