[Mesa-dev] [PATCH 7/8] loader: cleanup loader_get_pci_id_from_id fallout path

[Emil Velikov]

Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com>
---
 src/loader/loader.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/loader/loader.c b/src/loader/loader.c
index cbb501d..d75380b 100644
--- a/src/loader/loader.c
+++ b/src/loader/loader.c
@@ -264,13 +264,13 @@ loader_get_pci_id_for_fd(int fd, int *vendor_id, int 
*chip_id)
 
    udev = udev_new();
    device = udev_device_new_from_fd(udev, fd);
-   if (!device)
-      goto out;
+   if (device == NULL)
+      goto out_unref;
 
    parent = udev_device_get_parent(device);
    if (parent == NULL) {
       log_(_LOADER_WARNING, "MESA-LOADER: could not get parent device\n");
-      goto out;
+      goto out_device_unref;
    }
 
    pci_id = udev_device_get_property_value(parent, "PCI_ID");
@@ -278,14 +278,13 @@ loader_get_pci_id_for_fd(int fd, int *vendor_id, int 
*chip_id)
        sscanf(pci_id, "%x:%x", vendor_id, chip_id) != 2) {
       log_(_LOADER_WARNING, "MESA-LOADER: malformed or no PCI ID\n");
       *chip_id = -1;
-      goto out;
    }
 
-out:
-   if (device)
-      udev_device_unref(device);
-   if (udev)
-      udev_unref(udev);
+out_device_unref:
+   udev_device_unref(device);
+
+out_unref:
+   udev_unref(udev);
 
    return (*chip_id >= 0);
 }
-- 
1.8.5.2

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev