--- i830_crt.c~ 2008-10-18 19:13:06.000000000 -0400
+++ i830_crt.c  2008-12-03 19:25:57.000000000 -0500
@@ -374,12 +374,13 @@
      */
     if (IS_I945G(pI830) || IS_I945GM(pI830) || IS_I965G(pI830) ||
            IS_G33CLASS(pI830)) {
-       if (i830_crt_detect_hotplug(output))
+       if (i830_crt_detect_hotplug(output)) {
            status = XF86OutputStatusConnected;
+               goto done;
+       }
        else
            status = XF86OutputStatusDisconnected;
 
-       goto done;
     }
 
     /*