[coreboot-gerrit] Change in coreboot[master]: device/pci: Add NULL check for PCI driver's .ops

[Nico Huber (Code Review)]

Hello  Felix Singer,

I'd like you to do a code review. Please visit

https://review.coreboot.org/c/coreboot/+/46297

to review the following change.

Change subject: device/pci: Add NULL check for PCI driver's .ops
......................................................................

device/pci: Add NULL check for PCI driver's .ops

Add a NULL check and only skip setting the default operations
if `.ops` was set by a driver.

Change-Id: I5dcc05ebb092fb9c4be929c81ea2b05a10b1311b
Signed-off-by: Nico Huber 
---
M src/device/pci_device.c
1 file changed, 7 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/46297/1

diff --git a/src/device/pci_device.c b/src/device/pci_device.c
index 80dad7e..62c4535 100644
--- a/src/device/pci_device.c
+++ b/src/device/pci_device.c
@@ -955,13 +955,16 @@
    	if ((driver->vendor == dev->vendor) &&
    	    device_id_match(driver, dev->device)) {
    		dev->ops = (struct device_operations *)driver->ops;
-			printk(BIOS_SPEW, "%s [%04x/%04x] %sops\n",
-			       dev_path(dev), driver->vendor, driver->device,
-			       (driver->ops->scan_bus ? "bus " : ""));
-			return;
+			break;
    	}
    }

+	if (dev->ops) {
+		printk(BIOS_SPEW, "%s [%04x/%04x] %sops\n", dev_path(dev),
+		       driver->vendor, driver->device, (driver->ops->scan_bus ? "bus " : ""));
+		return;
+	}
+
    /* If I don't have a specific driver use the default operations. */
    switch (dev->hdr_type & 0x7f) {	/* Header type */
    case PCI_HEADER_TYPE_NORMAL: