[Nouveau] [PATCH] pci: fix check in nvkm_pcie_set_link

Karol Herbst nouveau at karolherbst.de
Tue Jan 12 13:48:30 PST 2016


I think while changing some stuff in the review process, stuff broke here a
little. This check should be good now and is required for working code

Signed-off-by: Karol Herbst <nouveau at karolherbst.de>
---
 drm/nouveau/nvkm/subdev/pci/pcie.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drm/nouveau/nvkm/subdev/pci/pcie.c b/drm/nouveau/nvkm/subdev/pci/pcie.c
index b32954f..66db77d 100644
--- a/drm/nouveau/nvkm/subdev/pci/pcie.c
+++ b/drm/nouveau/nvkm/subdev/pci/pcie.c
@@ -119,7 +119,7 @@ nvkm_pcie_set_link(struct nvkm_pci *pci, enum nvkm_pcie_speed speed, u8 width)
 	struct pci_bus *pbus;
 	int ret;
 
-	if (pci || !pci_is_pcie(pci->pdev))
+	if (!pci || (pci && !pci_is_pcie(pci->pdev)))
 		return 0;
 	pbus = pci->pdev->bus;
 
-- 
2.7.0



More information about the Nouveau mailing list