Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 281364
b: refs/heads/master
c: 23aff74
h: refs/heads/master
v: v3
  • Loading branch information
Ravishankar karkala Mallikarjunayya authored and Greg Kroah-Hartman committed Dec 14, 2011
1 parent a3ed3e3 commit 4e63d44
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 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: a65df7974695f53cadfd2ecda60eb03a894b0480
refs/heads/master: 23aff74c1a7fed4019f230e6190608ce9c5d3359
7 changes: 4 additions & 3 deletions trunk/drivers/staging/comedi/drivers/dt3000.c
Original file line number Diff line number Diff line change
Expand Up @@ -849,7 +849,7 @@ static int dt3000_attach(struct comedi_device *dev, struct comedi_devconfig *it)
int bus, slot;
int ret = 0;

printk("dt3000:");
dev_dbg(dev->hw_dev, "dt3000:\n");
bus = it->options[0];
slot = it->options[1];

Expand All @@ -861,15 +861,16 @@ static int dt3000_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (ret < 0)
return ret;
if (ret == 0) {
printk(" no DT board found\n");
dev_warn(dev->hw_dev, "no DT board found\n");
return -ENODEV;
}

dev->board_name = this_board->name;

if (request_irq(devpriv->pci_dev->irq, dt3k_interrupt, IRQF_SHARED,
"dt3000", dev)) {
printk(" unable to allocate IRQ %u\n", devpriv->pci_dev->irq);
dev_err(dev->hw_dev, "unable to allocate IRQ %u\n",
devpriv->pci_dev->irq);
return -EINVAL;
}
dev->irq = devpriv->pci_dev->irq;
Expand Down

0 comments on commit 4e63d44

Please sign in to comment.