Module Name: src
Committed By: martin
Date: Fri Nov 28 10:01:27 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915 [netbsd-7]: intel_opregion.c
Log Message:
Pull up following revision(s) (requested by nonaka in ticket #271):
sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c: revision 1.8
Avoid NULL pointer dereference when acpivga isn't attached.
To generate a diff of this commit:
cvs rdiff -u -r1.5.2.1 -r1.5.2.2 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c:1.5.2.1 src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c:1.5.2.2
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c:1.5.2.1 Tue Nov 11 09:06:32 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c Fri Nov 28 10:01:27 2014
@@ -674,7 +674,9 @@ static void intel_didl_outputs(struct dr
#ifdef __NetBSD__
ad = dev->pdev->pd_ad;
- if (ad == NULL || !device_is_a(ad->ad_device, "acpivga"))
+ if (ad == NULL ||
+ ad->ad_device == NULL ||
+ !device_is_a(ad->ad_device, "acpivga"))
return;
#else
handle = ACPI_HANDLE(&dev->pdev->dev);
