Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb5ca72e authored by Stefan Richter's avatar Stefan Richter
Browse files

firewire: fw-ohci: switch on bus power after resume on PPC PMac 



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: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent 080de8c2

drivers/firewire/fw-ohci.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -2251,8 +2251,10 @@ static int pci_suspend(struct pci_dev *pdev, pm_message_t state) 
	if (machine_is(powermac)) {

	if (machine_is(powermac)) {

		struct device_node *ofn = pci_device_to_OF_node(pdev);

		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_ENABLE, ofn, 0, 0);

			pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, ofn, 0, 0);

		}

	}

	}

#endif /* CONFIG_PPC_PMAC */

#endif /* CONFIG_PPC_PMAC */
@@ -2269,9 +2271,11 @@ static int pci_resume(struct pci_dev *pdev) 
	if (machine_is(powermac)) {

	if (machine_is(powermac)) {

		struct device_node *ofn = pci_device_to_OF_node(pdev);

		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);

			pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 1);

		}

		}

	}

#endif /* CONFIG_PPC_PMAC */

#endif /* CONFIG_PPC_PMAC */





	pci_set_power_state(pdev, PCI_D0);

	pci_set_power_state(pdev, PCI_D0);