From 1104cf903426490f955e22dbaa880ad07ac41350 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 8 Apr 2013 14:29:21 -0700 Subject: [PATCH] --- yaml --- r: 363981 b: refs/heads/master c: 894ab190b9cfae1e040fd3d333528206eb0ea861 h: refs/heads/master i: 363979: 64095b86a97e338769a9821447f35832411234b0 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/acl7225b.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index d32fc252aac7..724cf099eb17 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b5052511ec890ec59280de0d505456025d405798 +refs/heads/master: 894ab190b9cfae1e040fd3d333528206eb0ea861 diff --git a/trunk/drivers/staging/comedi/drivers/acl7225b.c b/trunk/drivers/staging/comedi/drivers/acl7225b.c index eb8e906929ab..284232fca555 100644 --- a/trunk/drivers/staging/comedi/drivers/acl7225b.c +++ b/trunk/drivers/staging/comedi/drivers/acl7225b.c @@ -74,13 +74,8 @@ static int acl7225b_attach(struct comedi_device *dev, iobase = it->options[0]; iorange = board->io_range; - printk(KERN_INFO "comedi%d: acl7225b: board=%s 0x%04x\n", dev->minor, - board->name, iobase); - if (!request_region(iobase, iorange, "acl7225b")) { - printk(KERN_ERR "comedi%d: request_region failed - I/O port conflict\n", - dev->minor); + if (!request_region(iobase, iorange, "acl7225b")) return -EIO; - } dev->board_name = board->name; dev->iobase = iobase; dev->irq = 0;