Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

e032d93e · Linus Torvalds <[email protected]> · 2007-09-10 14:38:15 -07:00

* '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)

Commit: e032d93e1a3b2facf17029a643faf141dcea5f70
Parents: b1a8d700 · 55111428

Merge commit. Changes below are compared with the first parent: b1a8d700.

Changes

1 files changed · +2 −4

File	Status	Add	Del	Content
drivers/firewire/fw-ohci.c	modified	+2	−4	View file

drivers/firewire/fw-ohci.c

View file

diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index 7e427b4..e14c1ca 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;
 }