Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a3f8ad3 authored by Stefan Richter's avatar Stefan Richter
Browse files

ieee1394: ohci1394: revert fail on error in suspend



Some errors during preparation for suspended state can be skipped with a
warning instead of a failure of the whole suspend transition, notably an
error in pci_set_power_state.

Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent def4d873
Loading
Loading
Loading
Loading
+11 −2
Original line number Diff line number Diff line
@@ -3534,6 +3534,9 @@ static int ohci1394_pci_suspend(struct pci_dev *pdev, pm_message_t state)
	int err;
	struct ti_ohci *ohci = pci_get_drvdata(pdev);

	printk(KERN_INFO "%s does not fully support suspend and resume yet\n",
	       OHCI1394_DRIVER_NAME);

	PRINT(KERN_DEBUG, "suspend called");
	if (!ohci)
		return -ENXIO;
@@ -3558,11 +3561,17 @@ static int ohci1394_pci_suspend(struct pci_dev *pdev, pm_message_t state)
	ohci_soft_reset(ohci);

	err = pci_save_state(pdev);
	if (err)
	if (err) {
		printk(KERN_ERR "%s: pci_save_state failed with %d\n",
		       OHCI1394_DRIVER_NAME, err);
		return err;
	}
	err = pci_set_power_state(pdev, pci_choose_state(pdev, state));
#ifdef OHCI1394_DEBUG
	if (err)
		return err;
		printk(KERN_DEBUG "%s: pci_set_power_state failed with %d\n",
		       OHCI1394_DRIVER_NAME, err);
#endif /* OHCI1394_DEBUG */

/* PowerMac suspend code comes last */
#ifdef CONFIG_PPC_PMAC