Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 40156
b: refs/heads/master
c: 16bfa67
h: refs/heads/master
v: v3
  • Loading branch information
Larry Finger authored and John W. Linville committed Oct 17, 2006
1 parent 907be07 commit 64482c4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 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: 7c28ad2d83ecc637237fe684659a6afbce0bb2a8
refs/heads/master: 16bfa676a7cc64695f7e9694c380ebd26c461ae5
6 changes: 5 additions & 1 deletion trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -4207,7 +4207,11 @@ static int bcm43xx_resume(struct pci_dev *pdev)
dprintk(KERN_INFO PFX "Resuming...\n");

pci_set_power_state(pdev, 0);
pci_enable_device(pdev);
err = pci_enable_device(pdev);
if (err) {
printk(KERN_ERR PFX "Failure with pci_enable_device!\n");
return err;
}
pci_restore_state(pdev);

bcm43xx_chipset_attach(bcm);
Expand Down

0 comments on commit 64482c4

Please sign in to comment.