X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Finit.c;h=347668163f7a9f9a0b6d75227022b19f5a4ae3b8;hb=93c1c6bcc9e2b52652b859986354ddd54ef34058;hp=b38b8bbe03fabebe192811e2b747c7c330b49f24;hpb=ea404c2a8800e1dfef2c4165edae15c82530da00;p=pciutils.git

diff --git a/lib/init.c b/lib/init.c
index b38b8bb..3476681 100644
--- a/lib/init.c
+++ b/lib/init.c
@@ -3,7 +3,9 @@
  *
  *	Copyright (c) 1997--2018 Martin Mares <mj@ucw.cz>
  *
- *	Can be freely distributed and used under the terms of the GNU GPL.
+ *	Can be freely distributed and used under the terms of the GNU GPL v2+.
+ *
+ *	SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <stdio.h>
@@ -151,6 +153,11 @@ static struct pci_methods *pci_methods[PCI_ACCESS_MAX] = {
   NULL,
   NULL,
 #endif
+#if defined(PCI_HAVE_PM_ECAM)
+  &pm_ecam,
+#else
+  NULL,
+#endif
 };
 
 // If PCI_ACCESS_AUTO is selected, we probe the access methods in this order
@@ -169,6 +176,7 @@ static int probe_sequence[] = {
   PCI_ACCESS_WIN32_KLDBG,
   PCI_ACCESS_WIN32_SYSDBG,
   // Low-level methods poking the hardware directly
+  PCI_ACCESS_ECAM,
   PCI_ACCESS_I386_TYPE1,
   PCI_ACCESS_I386_TYPE2,
   PCI_ACCESS_MMIO_TYPE1_EXT,
@@ -469,7 +477,7 @@ pci_init_internal(struct pci_access *a, int skip_method)
 void
 pci_init_v35(struct pci_access *a)
 {
-  if (!pci_init_internal(a, 1, -1))
+  if (!pci_init_internal(a, -1))
     a->error("Cannot find any working access method.");
 }