From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756685AbYCALgJ (ORCPT ); Sat, 1 Mar 2008 06:36:09 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760930AbYCALfx (ORCPT ); Sat, 1 Mar 2008 06:35:53 -0500 Received: from einhorn.in-berlin.de ([192.109.42.8]:58284 "EHLO einhorn.in-berlin.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760575AbYCALfw (ORCPT ); Sat, 1 Mar 2008 06:35:52 -0500 X-Envelope-From: stefanr@s5r6.in-berlin.de Date: Sat, 1 Mar 2008 12:34:50 +0100 (CET) From: Stefan Richter Subject: [PATCH 1/4] firewire: fw-ohci: switch on bus power after resume on PPC PMac To: linux1394-devel@lists.sourceforge.net cc: linuxppc-dev@ozlabs.org, linux-kernel@vger.kernel.org, benh@kernel.crashing.org In-Reply-To: Message-ID: References: <1204340392.15052.455.camel@pasglop> <47C90E81.7050603@s5r6.in-berlin.de> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; CHARSET=us-ascii Content-Disposition: INLINE Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The platform feature calls in the suspend method switched off cable power, but the calls in the resume method did not switch it back on. Add the necessary feature call to .resume. Also add the corresponding call to .suspend to make .suspend's behavior explicitly the same on all PMacs. Signed-off-by: Stefan Richter --- drivers/firewire/fw-ohci.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) Index: linux/drivers/firewire/fw-ohci.c =================================================================== --- linux.orig/drivers/firewire/fw-ohci.c +++ linux/drivers/firewire/fw-ohci.c @@ -2259,8 +2259,10 @@ static int pci_suspend(struct pci_dev *p if (machine_is(powermac)) { struct device_node *ofn = pci_device_to_OF_node(pdev); - if (ofn) + if (ofn) { pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 0); + pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, ofn, 0, 0); + } } #endif /* CONFIG_PPC_PMAC */ @@ -2277,8 +2279,10 @@ static int pci_resume(struct pci_dev *pd if (machine_is(powermac)) { struct device_node *ofn = pci_device_to_OF_node(pdev); - if (ofn) + if (ofn) { + pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, ofn, 0, 1); pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 1); + } } #endif /* CONFIG_PPC_PMAC */ -- Stefan Richter -=====-==--- --== ----= http://arcgraph.de/sr/