diff options
| author | Olivier Fourdan <ofourdan@redhat.com> | 2020-09-08 10:03:11 +0200 |
|---|---|---|
| committer | Olivier Fourdan <ofourdan@redhat.com> | 2020-09-08 10:50:34 +0200 |
| commit | 39cb95e959fab97a7e255dda1a1599b096fb0f7e (patch) | |
| tree | 55308e64b8edfb26cde10caea272a8f6f81eb254 | |
| parent | 4b6fce5975c2f931a0478cf4deeec97529b05eb6 (diff) | |
Revert "linux: Fix platform device PCI detection for complex bus topologies"
This reverts commit 5c96eb5f44e62a4cfe835023cde304eb5795b8fd.
https://gitlab.freedesktop.org/xorg/xserver/-/issues/1068
| -rw-r--r-- | config/udev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/udev.c b/config/udev.c index 14409549b..8c6c4b666 100644 --- a/config/udev.c +++ b/config/udev.c @@ -470,7 +470,7 @@ config_udev_odev_setup_attribs(struct udev_device *udev_device, const char *path config_odev_probe_proc_ptr probe_callback) { struct OdevAttributes *attribs = config_odev_allocate_attributes(); - const char *value, *str; + const char *value; attribs->path = XNFstrdup(path); attribs->syspath = XNFstrdup(syspath); @@ -478,8 +478,8 @@ config_udev_odev_setup_attribs(struct udev_device *udev_device, const char *path attribs->minor = minor; value = udev_device_get_property_value(udev_device, "ID_PATH"); - if (value && (str = strstr(value, "pci-"))) { - attribs->busid = XNFstrdup(str); + if (value && !strncmp(value, "pci-", 4)) { + attribs->busid = XNFstrdup(value); attribs->busid[3] = ':'; } |