Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325207
b: refs/heads/master
c: bc4b4aa
h: refs/heads/master
i:
  325205: a9b41fe
  325203: 5f01650
  325199: 90fea26
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Sep 12, 2012
1 parent 24efb06 commit 6855081
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 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: b84a9ce54430225053667cce146f06d6ee257372
refs/heads/master: bc4b4aa5f5153d42d03244c2cbb19546f6200aef
12 changes: 3 additions & 9 deletions trunk/drivers/staging/comedi/drivers/adv_pci1710.c
Original file line number Diff line number Diff line change
Expand Up @@ -1332,8 +1332,6 @@ static int pci1710_attach(struct comedi_device *dev,
int ret, subdev, n_subdevices;
unsigned int irq;

dev_info(dev->class_dev, DRV_NAME ": attach\n");

ret = alloc_private(dev, sizeof(*devpriv));
if (ret < 0)
return -ENOMEM;
Expand Down Expand Up @@ -1377,15 +1375,8 @@ static int pci1710_attach(struct comedi_device *dev,
if (request_irq(irq, interrupt_service_pci1710,
IRQF_SHARED, "Advantech PCI-1710",
dev)) {
dev_dbg(dev->class_dev,
"unable to allocate IRQ %d, DISABLING IT",
irq);
irq = 0; /* Can't use IRQ */
} else {
dev_dbg(dev->class_dev, "irq=%u", irq);
}
} else {
dev_dbg(dev->class_dev, "IRQ disabled");
}
} else {
irq = 0;
Expand Down Expand Up @@ -1480,6 +1471,9 @@ static int pci1710_attach(struct comedi_device *dev,

devpriv->valid = 1;

dev_info(dev->class_dev, "%s attached, irq %sabled\n",
dev->board_name, dev->irq ? "en" : "dis");

return 0;
}

Expand Down

0 comments on commit 6855081

Please sign in to comment.