Module Name:    src
Committed By:   nonaka
Date:           Tue Nov 25 03:31:12 UTC 2014

Modified Files:
        src/sys/external/bsd/drm2/dist/drm/i915: intel_opregion.c

Log Message:
avoid NULL pointer dereference when acpivga isn't attached.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
    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.7 src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c:1.8
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c:1.7	Thu Nov  6 01:26:02 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c	Tue Nov 25 03:31:12 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);

Reply via email to