Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 363447
b: refs/heads/master
c: 0b33e43
h: refs/heads/master
i:
  363445: 101b240
  363443: abff0d8
  363439: d59e106
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Mar 14, 2013
1 parent 01ea477 commit e75560c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 13 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: 818f569fe930c5b8a05d1a44ece3c63c99c13c88
refs/heads/master: 0b33e43ab39b0080fca9c2cfab58e60af0dd4971
13 changes: 1 addition & 12 deletions trunk/drivers/staging/comedi/drivers/addi_apci_1710.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,7 @@ static int apci1710_auto_attach(struct comedi_device *dev,
ret = comedi_pci_enable(dev);
if (ret)
return ret;

if (this_board->i_IorangeBase1)
dev->iobase = pci_resource_start(pcidev, 1);
else
dev->iobase = pci_resource_start(pcidev, 0);

devpriv->iobase = dev->iobase;
devpriv->i_IobaseAmcc = pci_resource_start(pcidev, 0);
devpriv->i_IobaseAddon = pci_resource_start(pcidev, 2);
devpriv->i_IobaseReserved = pci_resource_start(pcidev, 3);
devpriv->s_BoardInfos.ui_Address = pci_resource_start(pcidev, 2);

if (pcidev->irq > 0) {
ret = request_irq(pcidev->irq, v_ADDI_Interrupt, IRQF_SHARED,
Expand All @@ -65,8 +56,6 @@ static int apci1710_auto_attach(struct comedi_device *dev,

i_ADDI_AttachPCI1710(dev);

devpriv->s_BoardInfos.ui_Address = pci_resource_start(pcidev, 2);

i_APCI1710_Reset(dev);
return 0;
}
Expand Down

0 comments on commit e75560c

Please sign in to comment.