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

Commit 8497f696 authored by Huang Ying's avatar Huang Ying Committed by Bjorn Helgaas
Browse files

PCI: do not call pci_set_power_state with PCI_D3cold 



PCI subsystem has not been ready for D3cold support yet.  So
PCI_D3cold should not be used as parameter for pci_set_power_state.
This patch is needed for upcoming PCI_D3cold support.

This patch has no functionality change, because pci_set_power_state
will bound the parameter to PCI_D3hot too.

CC: Michal Miroslaw <mirq-linux@rere.qmqm.pl>
CC: Jesse Barnes <jesse.barnes@intel.com>
Reviewed-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarHuang Ying <ying.huang@intel.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 71a83bd7

arch/x86/pci/mrst.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -264,7 +264,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_ANY_ID, pci_d3delay_fixup); 




static void __devinit mrst_power_off_unused_dev(struct pci_dev *dev)

static void __devinit mrst_power_off_unused_dev(struct pci_dev *dev)

{

{

	pci_set_power_state(dev, PCI_D3cold);

	pci_set_power_state(dev, PCI_D3hot);

}

}

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0801, mrst_power_off_unused_dev);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0801, mrst_power_off_unused_dev);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0809, mrst_power_off_unused_dev);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0809, mrst_power_off_unused_dev);

drivers/misc/cb710/core.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -180,7 +180,7 @@ static int cb710_suspend(struct pci_dev *pdev, pm_message_t state) 
	pci_save_state(pdev);

	pci_save_state(pdev);

	pci_disable_device(pdev);

	pci_disable_device(pdev);

	if (state.event & PM_EVENT_SLEEP)

	if (state.event & PM_EVENT_SLEEP)

		pci_set_power_state(pdev, PCI_D3cold);

		pci_set_power_state(pdev, PCI_D3hot);

	return 0;

	return 0;

}

}