From a224f80fc3d91f6781ff6a37ed9eaebc1b1eb59c Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 9 Apr 2013 16:07:16 -0700 Subject: [PATCH] --- yaml --- r: 364023 b: refs/heads/master c: f70c2b6d08d2b959597bdeb22577d51396794ad0 h: refs/heads/master i: 364021: a67873de7ef648ae118fd17ac634518947b42463 364019: 3bc6481e38056f78284f107322bfb0aa11eb79d2 364015: 59138fed4eb72c7cf08ac0ab36b4ea6e26301b06 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/pcl724.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 46d21d3947f6..5defb2b88028 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 531f4fd1fbd169b6a22efe829663e8a278b88766 +refs/heads/master: f70c2b6d08d2b959597bdeb22577d51396794ad0 diff --git a/trunk/drivers/staging/comedi/drivers/pcl724.c b/trunk/drivers/staging/comedi/drivers/pcl724.c index 7b3c4293c01b..a8112e3af98f 100644 --- a/trunk/drivers/staging/comedi/drivers/pcl724.c +++ b/trunk/drivers/staging/comedi/drivers/pcl724.c @@ -114,15 +114,13 @@ static int pcl724_attach(struct comedi_device *dev, struct comedi_devconfig *it) iorange = PCL722_96_SIZE; /* PCL-724 in 96 DIO configuration */ printk(KERN_INFO "comedi%d: pcl724: board=%s, 0x%03lx ", dev->minor, board->name, iobase); - if (!request_region(iobase, iorange, "pcl724")) { + if (!request_region(iobase, iorange, dev->board_name)) { printk("I/O port conflict\n"); return -EIO; } dev->iobase = iobase; - dev->board_name = board->name; - #ifdef PCL724_IRQ irq = 0; if (board->IRQbits != 0) { /* board support IRQ */ @@ -134,8 +132,8 @@ static int pcl724_attach(struct comedi_device *dev, struct comedi_devconfig *it) "DISABLING IT", irq); irq = 0; /* Bad IRQ */ } else { - if (request_irq - (irq, interrupt_pcl724, 0, "pcl724", dev)) { + if (request_irq(irq, interrupt_pcl724, 0, + dev->board_name, dev)) { printk(KERN_WARNING ", unable to allocate IRQ %u, " "DISABLING IT", irq);