From c2ededb1e170875ab33fae162c3716466f9cdf94 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 9 Apr 2013 16:29:29 -0700 Subject: [PATCH] --- yaml --- r: 364082 b: refs/heads/master c: 7ba25510ca88bed86e0e1e2537ae914e837afa99 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/poc.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 201fffc4d969..a5fb05bc6475 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 70998b990b0489dcebd2e5b75a0e0cc3fff1065e +refs/heads/master: 7ba25510ca88bed86e0e1e2537ae914e837afa99 diff --git a/trunk/drivers/staging/comedi/drivers/poc.c b/trunk/drivers/staging/comedi/drivers/poc.c index d7842c95d982..8a34f6f631fd 100644 --- a/trunk/drivers/staging/comedi/drivers/poc.c +++ b/trunk/drivers/staging/comedi/drivers/poc.c @@ -147,8 +147,6 @@ static int poc_attach(struct comedi_device *dev, struct comedi_devconfig *it) printk(KERN_INFO "comedi%d: poc: using %s iobase 0x%lx\n", dev->minor, board->name, iobase); - dev->board_name = board->name; - if (iobase == 0) { printk(KERN_ERR "io base address required\n"); return -EINVAL; @@ -156,7 +154,7 @@ static int poc_attach(struct comedi_device *dev, struct comedi_devconfig *it) iosize = board->iosize; /* check if io addresses are available */ - if (!request_region(iobase, iosize, "dac02")) { + if (!request_region(iobase, iosize, dev->board_name)) { printk(KERN_ERR "I/O port conflict: failed to allocate ports " "0x%lx to 0x%lx\n", iobase, iobase + iosize - 1); return -EIO;