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

Commit 8b62c8c6 authored by Dave Airlie's avatar Dave Airlie
Browse files

nouveau: move the hotplug ignore to correct place. 

Introduced in b440bde7, however it was added to
the wrong function in nouveau.

https://bugzilla.kernel.org/show_bug.cgi?id=86011


Cc: Bjorn Helgaas <bhelgaas@google.com>
CC: stable@vger.kernel.org  # v3.15+
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent d87c0e3d

drivers/gpu/drm/nouveau/nouveau_drm.c

+1 −1
Original line number Diff line number Diff line
@@ -629,7 +629,6 @@ int nouveau_pmops_suspend(struct device *dev) 


	pci_save_state(pdev);

	pci_disable_device(pdev);

	pci_ignore_hotplug(pdev);

	pci_set_power_state(pdev, PCI_D3hot);

	return 0;

}
@@ -933,6 +932,7 @@ static int nouveau_pmops_runtime_suspend(struct device *dev) 
	ret = nouveau_do_suspend(drm_dev, true);

	pci_save_state(pdev);

	pci_disable_device(pdev);

	pci_ignore_hotplug(pdev);

	pci_set_power_state(pdev, PCI_D3cold);

	drm_dev->switch_power_state = DRM_SWITCH_POWER_DYNAMIC_OFF;

	return ret;