Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337565
b: refs/heads/master
c: 3dd5ca8
h: refs/heads/master
i:
  337563: 0a34183
v: v3
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Nov 1, 2012
1 parent c6aade8 commit ba41f10
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 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: 21309dabd3eec2827c7604a0cba19f3e795c33d7
refs/heads/master: 3dd5ca831317a752095040d403e80cf7a6a783b5
4 changes: 2 additions & 2 deletions trunk/drivers/staging/comedi/drivers/gsc_hpdi.c
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ static int __devinit hpdi_auto_attach(struct comedi_device *dev,
return -ENOMEM;
dev->private = devpriv;

if (comedi_pci_enable(pcidev, dev->driver->driver_name)) {
if (comedi_pci_enable(pcidev, dev->board_name)) {
dev_warn(dev->class_dev,
"failed enable PCI device and request regions\n");
return -EIO;
Expand All @@ -521,7 +521,7 @@ static int __devinit hpdi_auto_attach(struct comedi_device *dev,

/* get irq */
if (request_irq(pcidev->irq, handle_interrupt, IRQF_SHARED,
dev->driver->driver_name, dev)) {
dev->board_name, dev)) {
dev_warn(dev->class_dev,
"unable to allocate irq %u\n", pcidev->irq);
return -EINVAL;
Expand Down

0 comments on commit ba41f10

Please sign in to comment.