diff options
| author | Dave Airlie <airlied@redhat.com> | 2007-12-18 19:18:21 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2007-12-18 19:18:21 +1100 |
| commit | 629231c62675fe09f4eb948861a21980a9b79a5a (patch) | |
| tree | 097ebcbb9f305fdac4cb3ebc15ef89bb8cea20fd /linux-core/drm_edid.c | |
| parent | ea915c77e169a50ca7dc557512212eafa93e2205 (diff) | |
| parent | 6d03411e5faa124bac014ebacec470ffd7cf2ce4 (diff) | |
Merge branch 'modesetting-airlied' into modesetting-101
Diffstat (limited to 'linux-core/drm_edid.c')
| -rw-r--r-- | linux-core/drm_edid.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux-core/drm_edid.c b/linux-core/drm_edid.c index 7068cef3..41aa8f5e 100644 --- a/linux-core/drm_edid.c +++ b/linux-core/drm_edid.c @@ -443,12 +443,12 @@ struct edid *drm_get_edid(struct drm_output *output, edid = (struct edid *)drm_ddc_read(adapter); if (!edid) { dev_warn(&output->dev->pdev->dev, "%s: no EDID data\n", - output->name); + drm_get_output_name(output)); return NULL; } if (!edid_valid(edid)) { dev_warn(&output->dev->pdev->dev, "%s: EDID invalid.\n", - output->name); + drm_get_output_name(output)); kfree(edid); return NULL; } @@ -474,7 +474,7 @@ int drm_add_edid_modes(struct drm_output *output, struct edid *edid) } if (!edid_valid(edid)) { dev_warn(&output->dev->pdev->dev, "%s: EDID invalid.\n", - output->name); + drm_get_output_name(output)); return 0; } num_modes += add_established_modes(output, edid); |