Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 163983
b: refs/heads/master
c: 1ecff1e
h: refs/heads/master
i:
  163981: f3a85af
  163979: 2bb0948
  163975: 00aa57b
  163967: 45012aa
v: v3
  • Loading branch information
Adam Jackson authored and Dave Airlie committed Sep 8, 2009
1 parent a7a7079 commit b121e54
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ec2a4c3fdc8e82fe82a25d800e85c1ea06b74372
refs/heads/master: 1ecff1eb0b83efa85be5b54c958e831e37f993f3
3 changes: 0 additions & 3 deletions trunk/drivers/gpu/drm/drm_edid.c
Original file line number Diff line number Diff line change
Expand Up @@ -1011,7 +1011,6 @@ int drm_do_probe_ddc_edid(struct i2c_adapter *adapter,
if (i2c_transfer(adapter, msgs, 2) == 2)
return 0;

dev_info(&adapter->dev, "unable to read EDID block.\n");
return -1;
}
EXPORT_SYMBOL(drm_do_probe_ddc_edid);
Expand All @@ -1024,8 +1023,6 @@ static int drm_ddc_read_edid(struct drm_connector *connector,

ret = drm_do_probe_ddc_edid(adapter, buf, len);
if (ret != 0) {
dev_info(&connector->dev->pdev->dev, "%s: no EDID data\n",
drm_get_connector_name(connector));
goto end;
}
if (!edid_is_valid((struct edid *)buf)) {
Expand Down

0 comments on commit b121e54

Please sign in to comment.