Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Restore error message tw...



details:   https://anonhg.NetBSD.org/src/rev/dfe9ae0b50d9
branches:  trunk
changeset: 797407:dfe9ae0b50d9
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 16 21:28:50 2014 +0000

description:
Restore error message tweak that got lost in the merge.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/intel_display.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (19 lines):

diff -r 15432faf9925 -r dfe9ae0b50d9 sys/external/bsd/drm2/dist/drm/i915/intel_display.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_display.c       Wed Jul 16 21:11:47 2014 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_display.c       Wed Jul 16 21:28:50 2014 +0000
@@ -11329,10 +11329,12 @@
        const bus_size_t vgabase = 0x3c0;
        const bus_space_tag_t iot = dev->pdev->pd_pa.pa_iot;
        bus_space_handle_t ioh;
-
-       if (bus_space_map(iot, vgabase, 0x10, 0, &ioh)) {
+       int error;
+
+       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);



Home | Main Index | Thread Index | Old Index