Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 318116
b: refs/heads/master
c: 8779060
h: refs/heads/master
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jul 19, 2012
1 parent 2c9e542 commit 2f5e84e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 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: 423e0e3f551212df86d4e06287d253c2ae26e8dd
refs/heads/master: 87790601cc603ea657fa667dd329fb21f318dfa9
7 changes: 1 addition & 6 deletions trunk/drivers/staging/comedi/drivers/dyna_pci10xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ struct dyna_pci10xx_private {
struct mutex mutex;

/* device base address registers */
unsigned long BADR0, BADR1, BADR2, BADR3, BADR4, BADR5;
unsigned long BADR2, BADR3;
};

#define thisboard ((const struct boardtype *)dev->board_ptr)
Expand Down Expand Up @@ -288,13 +288,8 @@ static int dyna_pci10xx_attach(struct comedi_device *dev,

printk(KERN_INFO "comedi: dyna_pci10xx: device found!\n");

/* initialize device base address registers */
devpriv->BADR0 = pci_resource_start(pcidev, 0);
devpriv->BADR1 = pci_resource_start(pcidev, 1);
devpriv->BADR2 = pci_resource_start(pcidev, 2);
devpriv->BADR3 = pci_resource_start(pcidev, 3);
devpriv->BADR4 = pci_resource_start(pcidev, 4);
devpriv->BADR5 = pci_resource_start(pcidev, 5);

ret = comedi_alloc_subdevices(dev, 4);
if (ret)
Expand Down

0 comments on commit 2f5e84e

Please sign in to comment.