Module Name: src
Committed By: christos
Date: Sun Jul 13 15:15:06 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_display.c
Log Message:
print the error from bus_space_map.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
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.5 src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.5 Wed May 21 10:03:42 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c Sun Jul 13 11:15:06 2014
@@ -8969,14 +8969,14 @@ static void i915_disable_vga(struct drm_
vga_reg = VGACNTRL;
#ifdef __NetBSD__
- {
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)) {
+ if ((error = bus_space_map(iot, vgabase, 0x10, 0, &ioh)) != 0) {
aprint_error_dev(dev->pdev->pd_dev,
- "unable to map VGA registers");
+ "unable to map VGA registers (error %d)\n", error);
} else {
CTASSERT(vgabase <= VGA_SR_INDEX);
CTASSERT(vgabase <= VGA_SR_DATA);
@@ -8986,7 +8986,6 @@ static void i915_disable_vga(struct drm_
(sr1 | __BIT(5)));
bus_space_unmap(iot, ioh, 0x10);
}
- }
#else
vga_get_uninterruptible(dev->pdev, VGA_RSRC_LEGACY_IO);
outb(SR01, VGA_SR_INDEX);
