From 0b39de2fd899a306d7cbafcfe9a62cbdae1f4630 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 9 Apr 2013 16:08:22 -0700 Subject: [PATCH] --- yaml --- r: 364026 b: refs/heads/master c: 44a6438bbea4e7fcf269aca8b7de1e6b37f0b7b2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/pcl726.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index dc103e7ad26e..1c4b84e31653 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9526728e0a8516b79f3c62c3a7583269f5195ccb +refs/heads/master: 44a6438bbea4e7fcf269aca8b7de1e6b37f0b7b2 diff --git a/trunk/drivers/staging/comedi/drivers/pcl726.c b/trunk/drivers/staging/comedi/drivers/pcl726.c index 1cc0aa88f372..e4b7484988bd 100644 --- a/trunk/drivers/staging/comedi/drivers/pcl726.c +++ b/trunk/drivers/staging/comedi/drivers/pcl726.c @@ -236,15 +236,13 @@ static int pcl726_attach(struct comedi_device *dev, struct comedi_devconfig *it) iorange = board->io_range; printk(KERN_WARNING "comedi%d: pcl726: board=%s, 0x%03lx ", dev->minor, board->name, iobase); - if (!request_region(iobase, iorange, "pcl726")) { + if (!request_region(iobase, iorange, dev->board_name)) { printk(KERN_WARNING "I/O port conflict\n"); return -EIO; } dev->iobase = iobase; - dev->board_name = board->name; - devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL); if (!devpriv) return -ENOMEM; @@ -268,7 +266,7 @@ static int pcl726_attach(struct comedi_device *dev, struct comedi_devconfig *it) irq = 0; /* Bad IRQ */ } else { if (request_irq(irq, interrupt_pcl818, 0, - "pcl726", dev)) { + dev->board_name, dev)) { printk(KERN_WARNING ", unable to allocate IRQ %d," " DISABLING IT", irq);