Messages in this thread Patch in this message | | | Date | Wed, 25 Oct 2006 08:40:54 +0200 (CEST) | From | Stefan Richter <> | Subject | Re: pci_set_power_state() failure and breaking suspend |
| |
On 24 Okt, Benjamin Herrenschmidt wrote: >> Recently, ohci1394 grew some "proper" error handling in its suspend >> function, something that looks like: >> >> err = pci_set_power_state(pdev, pci_choose_state(pdev, state)); >> if (err) >> goto out; ... > First, it breaks some old PowerBooks where the internal OHCI has no PM > feature exposed on PCI....
What about the following? Could someone compile-test it with gcc4 and CONFIG_IEEE1394_VERBOSEDEBUG=n?
From: Stefan Richter <stefanr@s5r6.in-berlin.de> Subject: ieee1394: ohci1394: revert fail on error in suspend
The error checks in the suspend code were too harsh and broke suspend on some PPC_PMACs again which have extra platform code.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> --- Index: linux/drivers/ieee1394/ohci1394.c =================================================================== --- linux.orig/drivers/ieee1394/ohci1394.c 2006-10-25 08:26:44.000000000 +0200 +++ linux/drivers/ieee1394/ohci1394.c 2006-10-25 08:28:34.000000000 +0200 @@ -3553,11 +3553,16 @@ static int ohci1394_pci_suspend (struct int err; err = pci_save_state(pdev); - if (err) - goto out; + 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) - goto out; + printk(KERN_DEBUG "pci_set_power_state failed %d\n", err); +#endif /* OHCI1394_DEBUG */ /* PowerMac suspend code comes last */ #ifdef CONFIG_PPC_PMAC @@ -3570,8 +3575,8 @@ static int ohci1394_pci_suspend (struct pmac_call_feature(PMAC_FTR_1394_ENABLE, of_node, 0, 0); } #endif /* CONFIG_PPC_PMAC */ -out: - return err; + + return 0; } #endif /* CONFIG_PM */
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |