Module Name: src
Committed By: riastradh
Date: Wed Jul 16 21:28:50 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_display.c
Log Message:
Restore error message tweak that got lost in the merge.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_display.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_display.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.8 src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.9
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.8 Wed Jul 16 20:56:25 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c Wed Jul 16 21:28:50 2014
@@ -11329,10 +11329,12 @@ static void i915_disable_vga(struct drm_
const bus_size_t vgabase = 0x3c0;
const bus_space_tag_t iot = dev->pdev->pd_pa.pa_iot;
bus_space_handle_t ioh;
+ int error;
- if (bus_space_map(iot, vgabase, 0x10, 0, &ioh)) {
+ error = bus_space_map(iot, vgabase, 0x10, 0, &ioh);
+ if (error) {
aprint_error_dev(dev->pdev->pd_dev,
- "unable to map VGA registers");
+ "unable to map VGA registers: %d\n", error);
} else {
CTASSERT(vgabase <= VGA_SR_INDEX);
CTASSERT(vgabase <= VGA_SR_DATA);
