diff --git a/src/i830_sdvo.c b/src/i830_sdvo.c
index 256d16d..8d545e3 100644
--- a/src/i830_sdvo.c
+++ b/src/i830_sdvo.c
@@ -1822,17 +1822,6 @@ i830_sdvo_init(ScrnInfoPtr pScrn, int output_device)
 
     intel_output->pI2CBus = i2cbus;
 
-    /* Read the regs to test if we can talk to the device */
-    for (i = 0; i < 0x40; i++) {
-	if (!i830_sdvo_read_byte_quiet(output, i, &ch[i])) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-		       "No SDVO device found on SDVO%c\n",
-		       output_device == SDVOB ? 'B' : 'C');
-	    xf86OutputDestroy (output);
-	    return FALSE;
-	}
-    }
-
     /* Set up our wrapper I2C bus for DDC.  It acts just like the regular I2C
      * bus, except that it does the control bus switch to DDC mode before every
      * Start.  While we only need to do it at Start after every Stop after a
@@ -1866,7 +1855,12 @@ i830_sdvo_init(ScrnInfoPtr pScrn, int output_device)
     intel_output->pDDCBus = ddcbus;
     intel_output->dev_priv = dev_priv;
 
-    i830_sdvo_get_capabilities(output, &dev_priv->caps);
+    if (FALSE == 
+        i830_sdvo_get_capabilities(output, &dev_priv->caps)) {
+        xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                   "Failed to Get Capability on SDVO%c\n",
+		    output_device == SDVOB ? 'B' : 'C');
+    }
 
     if (dev_priv->caps.output_flags & (SDVO_OUTPUT_TMDS0 | SDVO_OUTPUT_TMDS1))
     {