From 9b766b0ff01bc4bbdd427b151b4deca7cf6fa265 Mon Sep 17 00:00:00 2001 From: Jason Wong Date: Sat, 27 Mar 2010 09:48:41 +0800 Subject: [PATCH] --- yaml --- r: 196968 b: refs/heads/master c: 7b8f2d1a2ece4180ac5fe418bf915efe728583a8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/cb_das16_cs.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 7407369b6cce..971922a9c000 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec14016e751106499ef237efc1000a424f53e372 +refs/heads/master: 7b8f2d1a2ece4180ac5fe418bf915efe728583a8 diff --git a/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c b/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c index 5632991760af..68bd5caa5e40 100644 --- a/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c +++ b/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c @@ -175,16 +175,16 @@ static int das16cs_attach(struct comedi_device *dev, printk("I/O base=0x%04lx ", dev->iobase); printk("fingerprint:\n"); - for (i = 0; i < 48; i += 2) { + for (i = 0; i < 48; i += 2) printk("%04x ", inw(dev->iobase + i)); - } + printk("\n"); ret = request_irq(link->irq.AssignedIRQ, das16cs_interrupt, IRQF_SHARED, "cb_das16_cs", dev); - if (ret < 0) { + if (ret < 0) return ret; - } + dev->irq = link->irq.AssignedIRQ; printk("irq=%u ", dev->irq); @@ -262,9 +262,9 @@ static int das16cs_detach(struct comedi_device *dev) { printk("comedi%d: das16cs: remove\n", dev->minor); - if (dev->irq) { + if (dev->irq) free_irq(dev->irq, dev); - } + return 0; }