diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-10 14:38:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-10 14:38:15 -0700 |
| commit | e032d93e1a3b2facf17029a643faf141dcea5f70 (patch) | |
| tree | 892f9ea8fd55ee6445a2840bcebde1c3e15a4d4a | |
| parent | b1a8d700e7fdf1bc44000e3edc24cc43f904df50 (diff) | |
| parent | 5511142870046a7bed947d51ec9b320856ee120a (diff) | |
| download | linux-e032d93e1a3b2facf17029a643faf141dcea5f70.tar.gz linux-e032d93e1a3b2facf17029a643faf141dcea5f70.tar.bz2 linux-e032d93e1a3b2facf17029a643faf141dcea5f70.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
firewire: fw-ohci: ignore failure of pci_set_power_state (fix suspend regression)
| -rw-r--r-- | drivers/firewire/fw-ohci.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c index 7e427b4c74b5..e14c1ca7813e 100644 --- a/drivers/firewire/fw-ohci.c +++ b/drivers/firewire/fw-ohci.c @@ -1945,10 +1945,8 @@ static int pci_suspend(struct pci_dev *pdev, pm_message_t state) return err; } err = pci_set_power_state(pdev, pci_choose_state(pdev, state)); - if (err) { - fw_error("pci_set_power_state failed\n"); - return err; - } + if (err) + fw_error("pci_set_power_state failed with %d\n", err); return 0; } |