Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 324952
b: refs/heads/master
c: 9c943f4
h: refs/heads/master
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Sep 8, 2012
1 parent ca46203 commit cd15124
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 29 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: 0818dc0a35571c294540cc8531f071e01f915205
refs/heads/master: 9c943f4ed479d58a2814239815e45fc0b61f4116
32 changes: 4 additions & 28 deletions trunk/drivers/staging/comedi/drivers/me4000.c
Original file line number Diff line number Diff line change
Expand Up @@ -383,45 +383,21 @@ static int me4000_probe(struct comedi_device *dev, struct comedi_devconfig *it)

static int get_registers(struct comedi_device *dev, struct pci_dev *pci_dev_p)
{
/*--------------------------- plx regbase -------------------------------*/

info->plx_regbase = pci_resource_start(pci_dev_p, 1);
if (info->plx_regbase == 0) {
printk(KERN_ERR
"comedi%d: me4000: get_registers(): "
"PCI base address 1 is not available\n", dev->minor);
if (!info->plx_regbase)
return -ENODEV;
}

/*--------------------------- me4000 regbase ----------------------------*/

info->me4000_regbase = pci_resource_start(pci_dev_p, 2);
if (info->me4000_regbase == 0) {
printk(KERN_ERR
"comedi%d: me4000: get_registers(): "
"PCI base address 2 is not available\n", dev->minor);
if (!info->me4000_regbase)
return -ENODEV;
}

/*--------------------------- timer regbase ------------------------------*/

info->timer_regbase = pci_resource_start(pci_dev_p, 3);
if (info->timer_regbase == 0) {
printk(KERN_ERR
"comedi%d: me4000: get_registers(): "
"PCI base address 3 is not available\n", dev->minor);
if (!info->timer_regbase)
return -ENODEV;
}

/*--------------------------- program regbase ----------------------------*/

info->program_regbase = pci_resource_start(pci_dev_p, 5);
if (info->program_regbase == 0) {
printk(KERN_ERR
"comedi%d: me4000: get_registers(): "
"PCI base address 5 is not available\n", dev->minor);
if (!info->program_regbase)
return -ENODEV;
}

return 0;
}
Expand Down

0 comments on commit cd15124

Please sign in to comment.