Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 317671
b: refs/heads/master
c: 2d993c2
h: refs/heads/master
i:
  317669: 1524b12
  317667: 341401d
  317663: 1acb647
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jul 6, 2012
1 parent 52f5032 commit af7aea1
Show file tree
Hide file tree
Showing 2 changed files with 3 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: 7c1e5bc7544db67985fed627cba206fc5dee6405
refs/heads/master: 2d993c242fea1dc41395a40fd7001127afa3b090
5 changes: 2 additions & 3 deletions trunk/drivers/staging/comedi/drivers/adl_pci6208.c
Original file line number Diff line number Diff line change
Expand Up @@ -213,17 +213,16 @@ static int pci6208_attach(struct comedi_device *dev,
return -EIO;
thisboard = comedi_board(dev);

dev->board_name = thisboard->name;

ret = comedi_pci_enable(devpriv->pci_dev, "adl_pci6208");
if (ret) {
dev_err(dev->class_dev,
"Failed to enable PCI device and request regions\n");
return ret;
}

dev->iobase = pci_resource_start(devpriv->pci_dev, 2);

dev->board_name = thisboard->name;

ret = comedi_alloc_subdevices(dev, 2);
if (ret)
return ret;
Expand Down

0 comments on commit af7aea1

Please sign in to comment.