---

yaml --- r: 293612 b: refs/heads/master c: 9292f37 h: refs/heads/master v: v3
git-mirror · Feb 3, 2012 · 366ce8c · 366ce8c
1 parent 0063b26
commit 366ce8c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30388c6e48e62b2806b14552275f091e2f5adbf4
+refs/heads/master: 9292f37e1f5c79400254dca46f83313488093825
diff --git a/trunk/drivers/gpu/drm/drm_edid.c b/trunk/drivers/gpu/drm/drm_edid.c
@@ -266,6 +266,11 @@ drm_do_probe_ddc_edid(struct i2c_adapter *adapter, unsigned char *buf,
 			}
 		};
 		ret = i2c_transfer(adapter, msgs, 2);
+		if (ret == -ENXIO) {
+			DRM_DEBUG_KMS("drm: skipping non-existent adapter %s\n",
+					adapter->name);
+			break;
+		}
 	} while (ret != 2 && --retries);
 
 	return ret == 2 ? 0 : -1;