From 462f18c7b25fe3e467f837647d07ab0a78aa8d2b Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 22 Feb 2015 21:39:56 +0100 Subject: Merged origin/release (checked in because wanted to merge new stuff) --- mesalib/src/loader/loader.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'mesalib/src/loader/loader.c') diff --git a/mesalib/src/loader/loader.c b/mesalib/src/loader/loader.c index 94c993ac8..9ff511522 100644 --- a/mesalib/src/loader/loader.c +++ b/mesalib/src/loader/loader.c @@ -207,9 +207,12 @@ libudev_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id) } pci_id = udev_device_get_property_value(parent, "PCI_ID"); - if (pci_id == NULL || - sscanf(pci_id, "%x:%x", vendor_id, chip_id) != 2) { - log_(_LOADER_WARNING, "MESA-LOADER: malformed or no PCI ID\n"); + if (pci_id == NULL) { + log_(_LOADER_INFO, "MESA-LOADER: no PCI ID\n"); + *chip_id = -1; + goto out; + } else if (sscanf(pci_id, "%x:%x", vendor_id, chip_id) != 2) { + log_(_LOADER_WARNING, "MESA-LOADER: malformed PCI ID\n"); *chip_id = -1; goto out; } -- cgit v1.2.3