Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 354159
b: refs/heads/master
c: d5255af
h: refs/heads/master
i:
  354157: c213504
  354155: 32d2ab6
  354151: 9790064
  354143: 2e5b46f
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jan 25, 2013
1 parent 5401158 commit be7a599
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 18 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: b2b82184c9c9a82553bfd49e7940ebc67fe655a8
refs/heads/master: d5255afb932aca4d64fedfc791fd1142defdd5dd
18 changes: 1 addition & 17 deletions trunk/drivers/staging/comedi/drivers/addi_apci_3501.c
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@ static int apci3501_auto_attach(struct comedi_device *dev,
struct addi_private *devpriv;
struct comedi_subdevice *s;
int ret, n_subdevices;
unsigned int dw_Dummy;

this_board = addi_find_boardinfo(dev, pcidev);
if (!this_board)
Expand Down Expand Up @@ -224,22 +223,7 @@ static int apci3501_auto_attach(struct comedi_device *dev,
dev->irq = pcidev->irq;
}

/* Read eepeom and fill addi_board Structure */

if (this_board->i_PCIEeprom) {
if (!(strcmp(this_board->pc_EepromChip, "S5920"))) {
/* Set 3 wait stait */
if (!(strcmp(dev->board_name, "apci035")))
outl(0x80808082, devpriv->i_IobaseAmcc + 0x60);
else
outl(0x83838383, devpriv->i_IobaseAmcc + 0x60);

/* Enable the interrupt for the controller */
dw_Dummy = inl(devpriv->i_IobaseAmcc + 0x38);
outl(dw_Dummy | 0x2000, devpriv->i_IobaseAmcc + 0x38);
}
addi_eeprom_read_info(dev, pci_resource_start(pcidev, 0));
}
addi_eeprom_read_info(dev, pci_resource_start(pcidev, 0));

n_subdevices = 7;
ret = comedi_alloc_subdevices(dev, n_subdevices);
Expand Down

0 comments on commit be7a599

Please sign in to comment.