From: Stefan Richter <stefanr@s5r6.in-berlin.de>
To: linux1394-devel@lists.sourceforge.net
Cc: linux-kernel@vger.kernel.org,
Benjamin Herrenschmidt <benh@kernel.crashing.org>
Subject: [rfc patch linux1394-2.6.git 1/2] ieee1394: ohci1394: revert fail on error in suspend
Date: Wed, 25 Oct 2006 09:44:49 +0200 (CEST) [thread overview]
Message-ID: <tkrat.08bb7d87c85b2fe5@s5r6.in-berlin.de> (raw)
In-Reply-To: <453F095E.4060106@s5r6.in-berlin.de>
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 09:22:05.000000000 +0200
+++ linux/drivers/ieee1394/ohci1394.c 2006-10-25 09:25:36.000000000 +0200
@@ -3534,6 +3534,9 @@ static int ohci1394_pci_suspend(struct p
int err;
struct ti_ohci *ohci = pci_get_drvdata(pdev);
+ printk(KERN_INFO "%s does not fully support suspend yet\n",
+ OHCI1394_DRIVER_NAME);
+
PRINT(KERN_DEBUG, "suspend called");
if (!ohci)
return -ENXIO;
@@ -3558,11 +3561,17 @@ static int ohci1394_pci_suspend(struct p
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
next prev parent reply other threads:[~2006-10-25 7:45 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-24 6:54 pci_set_power_state() failure and breaking suspend Benjamin Herrenschmidt
2006-10-24 7:40 ` Benjamin Herrenschmidt
2006-10-24 8:13 ` Stefan Richter
2006-10-24 8:29 ` Benjamin Herrenschmidt
2006-10-24 11:41 ` Stefan Richter
2006-10-24 22:40 ` Benjamin Herrenschmidt
2006-10-25 6:40 ` Stefan Richter
2006-10-25 6:48 ` Stefan Richter
2006-10-25 6:51 ` Stefan Richter
2006-10-25 7:44 ` Stefan Richter [this message]
2006-10-25 7:46 ` [rfc patch linux1394-2.6.git 2/2] ieee1394: ohci1394: proper log messages in suspend and resume Stefan Richter
2006-10-24 12:00 ` pci_set_power_state() failure and breaking suspend Rafael J. Wysocki
2006-10-24 16:09 ` Scott Wood
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tkrat.08bb7d87c85b2fe5@s5r6.in-berlin.de \
--to=stefanr@s5r6.in-berlin.de \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux1394-devel@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome