drm/i915/dvo: fix debug logging on unknown DID

Print DID not VID on the DID error path. Looks like a copy-paste error
from the VID error path. Clarify and clean up error logging, making them
distinguishable from each other, while at it.

Reported-by: Petru Mihancea <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101243
Reviewed-by: Clinton Taylor <[email protected]>
Signed-off-by: Jani Nikula <[email protected]>
Link: http://patchwork.freedesktop.org/patch/msgid/[email protected]

diff --git a/drivers/gpu/drm/i915/dvo_ch7xxx.c b/drivers/gpu/drm/i915/dvo_ch7xxx.c
index 44b3159f2fe8300562e23591f02150a6cec61a43..7aeeffd2428b688e5c404a59e1d331f633d879f1 100644 (file)
--- a/drivers/gpu/drm/i915/dvo_ch7xxx.c
+++ b/drivers/gpu/drm/i915/dvo_ch7xxx.c
@@ -217,9 +217,8 @@ static bool ch7xxx_init(struct intel_dvo_device *dvo,
 
        name = ch7xxx_get_id(vendor);
        if (!name) {
-               DRM_DEBUG_KMS("ch7xxx not detected; got 0x%02x from %s "
-                               "slave %d.\n",
-                         vendor, adapter->name, dvo->slave_addr);
+               DRM_DEBUG_KMS("ch7xxx not detected; got VID 0x%02x from %s slave %d.\n",
+                             vendor, adapter->name, dvo->slave_addr);
                goto out;
        }
 
@@ -229,9 +228,8 @@ static bool ch7xxx_init(struct intel_dvo_device *dvo,
 
        devid = ch7xxx_get_did(device);
        if (!devid) {
-               DRM_DEBUG_KMS("ch7xxx not detected; got 0x%02x from %s "
-                               "slave %d.\n",
-                         vendor, adapter->name, dvo->slave_addr);
+               DRM_DEBUG_KMS("ch7xxx not detected; got DID 0x%02x from %s slave %d.\n",
+                             device, adapter->name, dvo->slave_addr);
                goto out;
        }