Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 196968
b: refs/heads/master
c: 7b8f2d1
h: refs/heads/master
v: v3
  • Loading branch information
Jason Wong authored and Greg Kroah-Hartman committed May 11, 2010
1 parent 3333707 commit 9b766b0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ec14016e751106499ef237efc1000a424f53e372
refs/heads/master: 7b8f2d1a2ece4180ac5fe418bf915efe728583a8
12 changes: 6 additions & 6 deletions trunk/drivers/staging/comedi/drivers/cb_das16_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 9b766b0

Please sign in to comment.