ieee1394 update
Linus, please pull from the for-linus branch at
git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git for-linus
to receive the following patch...
Stefan Richter (1):
ieee1394: ohci1394: revert fail on error in suspend
drivers/ieee1394/ohci1394.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-)
...or just apply it from this mail. This fixes a regression since -rc1:
Some machines, esp. PPC_PMAC, cannot suspend if ohci1394 is loaded.
Date: Sun, 29 Oct 2006 19:52:49 +0100 (CET)
From: Stefan Richter <[email protected]>
Subject: 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.
---
drivers/ieee1394/ohci1394.c +14 -5
@@ -3552,12 +3552,21 @@ static int ohci1394_pci_suspend (struct {int err; +printk (KERN_INFO "%s does not fully support suspend and resume yet\n" , +OHCI1394_DRIVER_NAME ); + 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 "%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
@@ -3570,8 +3579,8 @@ #ifdef CONFIG_PPC_PMACpmac_call_feature (PMAC_FTR_1394_ENABLE , of_node,0 ,0 ); }#endif /* CONFIG_PPC_PMAC */ -out: -return err; + +return 0 ; }#endif /* CONFIG_PM */
Quoted 4 lines · Stefan Richter
Linus, please pull from the for-linus branch at
git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git for-linus
"Already up-to-date."
Did you forget to push?
Linus
Quoted 8 lines · Linus Torvalds
Quoted 3 lines · Stefan Richter
Linus, please pull from the for-linus branch at
git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git for-linus"Already up-to-date."
Did you forget to push?
Sorry, I had a typo in my local .git/remotes/. I properly pushed to master.kernel.org now. Thanks.
Signature · 3 lines
Stefan Richter -=====-=-==- =-=- ===-= http://arcgraph.de/sr/