From cffd66da8ac58e43beb275b8975e33c5ad407296 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 9 Apr 2013 16:09:10 -0700 Subject: [PATCH] --- yaml --- r: 364028 b: refs/heads/master c: 3f7b35ce30b5fceddaf5d9a8f33f5dcf0985e3b3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/pcl730.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5828c1a85eb1..68b1a0ac62b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 99c671a636ad76c9a9694413c5a9c9e92545d417 +refs/heads/master: 3f7b35ce30b5fceddaf5d9a8f33f5dcf0985e3b3 diff --git a/trunk/drivers/staging/comedi/drivers/pcl730.c b/trunk/drivers/staging/comedi/drivers/pcl730.c index e3de49937452..371f76cabb37 100644 --- a/trunk/drivers/staging/comedi/drivers/pcl730.c +++ b/trunk/drivers/staging/comedi/drivers/pcl730.c @@ -72,11 +72,10 @@ static int pcl730_attach(struct comedi_device *dev, struct comedi_devconfig *it) iorange = board->io_range; printk(KERN_INFO "comedi%d: pcl730: board=%s 0x%04lx ", dev->minor, board->name, iobase); - if (!request_region(iobase, iorange, "pcl730")) { + if (!request_region(iobase, iorange, dev->board_name)) { printk("I/O port conflict\n"); return -EIO; } - dev->board_name = board->name; dev->iobase = iobase; dev->irq = 0;