Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 41014
b: refs/heads/master
c: ffb3d13
h: refs/heads/master
v: v3
  • Loading branch information
Jeff Garzik authored and Linus Torvalds committed Nov 20, 2006
1 parent 9e93972 commit 63ffdda
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 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: a6cd2d94e1072a5756b5e5ab647d3223cba7e555
refs/heads/master: ffb3d1348605816de10d4e57281e02f606508b6c
7 changes: 4 additions & 3 deletions trunk/drivers/i2c/busses/scx200_acb.c
Original file line number Diff line number Diff line change
Expand Up @@ -494,11 +494,12 @@ static __init int scx200_create_pci(const char *text, struct pci_dev *pdev,
iface->pdev = pdev;
iface->bar = bar;

pci_enable_device_bars(iface->pdev, 1 << iface->bar);
rc = pci_enable_device_bars(iface->pdev, 1 << iface->bar);
if (rc)
goto errout_free;

rc = pci_request_region(iface->pdev, iface->bar, iface->adapter.name);

if (rc != 0) {
if (rc) {
printk(KERN_ERR NAME ": can't allocate PCI BAR %d\n",
iface->bar);
goto errout_free;
Expand Down

0 comments on commit 63ffdda

Please sign in to comment.