Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 364105
b: refs/heads/master
c: 5970b10
h: refs/heads/master
i:
  364103: edd52c2
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Apr 11, 2013
1 parent 1807527 commit bed0125
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 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: 8a38e9a503cd1500cd93c9685c45f300639f0936
refs/heads/master: 5970b1021dba511850976117e5948fda7be6300e
3 changes: 1 addition & 2 deletions trunk/drivers/staging/comedi/drivers/s626.c
Original file line number Diff line number Diff line change
Expand Up @@ -2599,8 +2599,7 @@ static int s626_auto_attach(struct comedi_device *dev,
if (ret)
return ret;

devpriv->mmio = ioremap(pci_resource_start(pcidev, 0),
pci_resource_len(pcidev, 0));
devpriv->mmio = pci_ioremap_bar(pcidev, 0);
if (!devpriv->mmio)
return -ENOMEM;

Expand Down

0 comments on commit bed0125

Please sign in to comment.