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: Stefan Richter <stefanr@s5r6.in-berlin.de>

+14 -5
+14 -5
drivers/ieee1394/ohci1394.c
··· 3552 { 3553 int err; 3554 3555 err = pci_save_state(pdev); 3556 - if (err) 3557 - goto out; 3558 err = pci_set_power_state(pdev, pci_choose_state(pdev, state)); 3559 if (err) 3560 - goto out; 3561 3562 /* PowerMac suspend code comes last */ 3563 #ifdef CONFIG_PPC_PMAC ··· 3579 pmac_call_feature(PMAC_FTR_1394_ENABLE, of_node, 0, 0); 3580 } 3581 #endif /* CONFIG_PPC_PMAC */ 3582 - out: 3583 - return err; 3584 } 3585 #endif /* CONFIG_PM */ 3586
··· 3552 { 3553 int err; 3554 3555 + printk(KERN_INFO "%s does not fully support suspend and resume yet\n", 3556 + OHCI1394_DRIVER_NAME); 3557 + 3558 err = pci_save_state(pdev); 3559 + if (err) { 3560 + printk(KERN_ERR "%s: pci_save_state failed with %d\n", 3561 + OHCI1394_DRIVER_NAME, err); 3562 + return err; 3563 + } 3564 err = pci_set_power_state(pdev, pci_choose_state(pdev, state)); 3565 + #ifdef OHCI1394_DEBUG 3566 if (err) 3567 + printk(KERN_DEBUG "%s: pci_set_power_state failed with %d\n", 3568 + OHCI1394_DRIVER_NAME, err); 3569 + #endif /* OHCI1394_DEBUG */ 3570 3571 /* PowerMac suspend code comes last */ 3572 #ifdef CONFIG_PPC_PMAC ··· 3570 pmac_call_feature(PMAC_FTR_1394_ENABLE, of_node, 0, 0); 3571 } 3572 #endif /* CONFIG_PPC_PMAC */ 3573 + 3574 + return 0; 3575 } 3576 #endif /* CONFIG_PM */ 3577