PCI: hv: Fix return value check in hv_pci_assign_slots()

Wei Yongjun · davem330 · commit 54be5b8ce33f · 2018-09-21T19:13:22.000-07:00
In case of error, the function pci_create_slot() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Fixes: a15f2c0 ("PCI: hv: support reporting serial number as slot information") Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c
@@ -1484,8 +1484,10 @@ static void hv_pci_assign_slots(struct hv_pcibus_device *hbus)
 		snprintf(name, SLOT_NAME_SIZE, "%u", hpdev->desc.ser);
 		hpdev->pci_slot = pci_create_slot(hbus->pci_bus, slot_nr,
 					  name, NULL);
-		if (!hpdev->pci_slot)
+		if (IS_ERR(hpdev->pci_slot)) {
 			pr_warn("pci_create slot %s failed\n", name);
+			hpdev->pci_slot = NULL;
+		}
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1484,8 +1484,10 @@ static void hv_pci_assign_slots(struct hv_pcibus_device *hbus)`
`1484`	`1484`	`snprintf(name, SLOT_NAME_SIZE, "%u", hpdev->desc.ser);`
`1485`	`1485`	`hpdev->pci_slot = pci_create_slot(hbus->pci_bus, slot_nr,`
`1486`	`1486`	`name, NULL);`
`1487`		`- if (!hpdev->pci_slot)`
	`1487`	`+ if (IS_ERR(hpdev->pci_slot)) {`
`1488`	`1488`	`pr_warn("pci_create slot %s failed\n", name);`
	`1489`	`+ hpdev->pci_slot = NULL;`
	`1490`	`+ }`
`1489`	`1491`	`}`
`1490`	`1492`	`}`
`1491`	`1493`