diff options
| author | Dave Airlie <airlied@gmail.com> | 2013-04-12 05:25:20 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-04-12 06:20:38 +0200 |
| commit | 1baee58638fc58248625255f5c5fcdb987f11b1f (patch) | |
| tree | e1744f67015708760935a3d1d318943c527e7f94 /drivers/gpu/drm | |
| parent | Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma (diff) | |
| download | linux-1baee58638fc58248625255f5c5fcdb987f11b1f.tar.xz linux-1baee58638fc58248625255f5c5fcdb987f11b1f.zip | |
udl: handle EDID failure properly.
Don't oops seems proper.
Cc: stable@vger.kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/udl/udl_connector.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c index fe5cdbcf2636..b44d548c56f8 100644 --- a/drivers/gpu/drm/udl/udl_connector.c +++ b/drivers/gpu/drm/udl/udl_connector.c @@ -61,6 +61,10 @@ static int udl_get_modes(struct drm_connector *connector) int ret; edid = (struct edid *)udl_get_edid(udl); + if (!edid) { + drm_mode_connector_update_edid_property(connector, NULL); + return 0; + } /* * We only read the main block, but if the monitor reports extension |