svn commit: r327100 - in head/sys/dev/drm2: i915 radeon

[Warner Losh]

Author: imp
Date: Sat Dec 23 05:32:20 2017
New Revision: 327100
URL: https://svnweb.freebsd.org/changeset/base/327100

Log:
  These drivers have a sentinel at the end of the device list. Exclude
  it.

Modified:
  head/sys/dev/drm2/i915/i915_drv.c
  head/sys/dev/drm2/radeon/radeon_drv.c

Modified: head/sys/dev/drm2/i915/i915_drv.c
==============================================================================
--- head/sys/dev/drm2/i915/i915_drv.c	Sat Dec 23 05:13:39 2017	(r327099)
+++ head/sys/dev/drm2/i915/i915_drv.c	Sat Dec 23 05:32:20 2017	(r327100)
@@ -1237,7 +1237,7 @@ MODULE_DEPEND(i915kms, iicbus, 1, 1, 1);
 MODULE_DEPEND(i915kms, iic, 1, 1, 1);
 MODULE_DEPEND(i915kms, iicbb, 1, 1, 1);
 MODULE_PNP_INFO("U32:vendor;U32:device;P:#;D:#", vgapci, i915, pciidlist,
-    sizeof(pciidlist[0]), nitems(pciidlist));
+    sizeof(pciidlist[0]), nitems(pciidlist) - 1);
 
 /* We give fast paths for the really cool registers */
 #define NEEDS_FORCE_WAKE(dev_priv, reg) \

Modified: head/sys/dev/drm2/radeon/radeon_drv.c
==============================================================================
--- head/sys/dev/drm2/radeon/radeon_drv.c	Sat Dec 23 05:13:39 2017	(r327099)
+++ head/sys/dev/drm2/radeon/radeon_drv.c	Sat Dec 23 05:32:20 2017	(r327100)
@@ -402,4 +402,4 @@ MODULE_DEPEND(radeonkms, iic, 1, 1, 1);
 MODULE_DEPEND(radeonkms, iicbb, 1, 1, 1);
 MODULE_DEPEND(radeonkms, firmware, 1, 1, 1);
 MODULE_PNP_INFO("U32:vendor;U32:device;P:#;D:#", vgapci, radeonkms,
-    pciidlist, sizeof(pciidlist[0]), nitems(pciidlist));
+    pciidlist, sizeof(pciidlist[0]), nitems(pciidlist) - 1);