Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 317605
b: refs/heads/master
c: 1fce303
h: refs/heads/master
i:
  317603: d379194
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jun 26, 2012
1 parent 645d087 commit d537ea4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 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: 13ab179c69769bb5be811b28fd6eeaeea2440359
refs/heads/master: 1fce3034f63c22392d1d8bc22b5e80b575b00df6
9 changes: 4 additions & 5 deletions trunk/drivers/staging/comedi/drivers/cb_das16_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -446,8 +446,6 @@ static int das16cs_attach(struct comedi_device *dev,
struct comedi_subdevice *s;
int ret;

dev_dbg(dev->class_dev, "cb_das16_cs: attach\n");

link = cur_dev; /* XXX hack */
if (!link)
return -EIO;
Expand All @@ -460,16 +458,13 @@ static int das16cs_attach(struct comedi_device *dev,
dev->board_name = thisboard->name;

dev->iobase = link->resource[0]->start;
dev_dbg(dev->class_dev, "I/O base=0x%04lx\n", dev->iobase);

ret = request_irq(link->irq, das16cs_interrupt,
IRQF_SHARED, "cb_das16_cs", dev);
if (ret < 0)
return ret;
dev->irq = link->irq;

dev_dbg(dev->class_dev, "irq=%u\n", dev->irq);

if (alloc_private(dev, sizeof(struct das16cs_private)) < 0)
return -ENOMEM;

Expand Down Expand Up @@ -514,6 +509,10 @@ static int das16cs_attach(struct comedi_device *dev,
s->insn_bits = das16cs_dio_insn_bits;
s->insn_config = das16cs_dio_insn_config;

dev_info(dev->class_dev, "%s: %s, I/O base=0x%04lx, irq=%u\n",
dev->driver->driver_name, dev->board_name,
dev->iobase, dev->irq);

return 1;
}

Expand Down

0 comments on commit d537ea4

Please sign in to comment.