summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_edid.c
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2022-04-11 17:00:33 +0300
committerJani Nikula <jani.nikula@intel.com>2022-04-14 16:51:55 +0300
commitb3eb97b66d4f2f919f5dd683c8ea62058fde1a93 (patch)
treeaea235d2daa2495ade394581576644c310ba2994 /drivers/gpu/drm/drm_edid.c
parentd3da3f4072c82e5be5aaafd6168c8effdea1be19 (diff)
downloadlinux-stable-b3eb97b66d4f2f919f5dd683c8ea62058fde1a93.tar.gz
linux-stable-b3eb97b66d4f2f919f5dd683c8ea62058fde1a93.tar.bz2
linux-stable-b3eb97b66d4f2f919f5dd683c8ea62058fde1a93.zip
drm/edid: drop extra local var
We don't need override as a variable for anything. Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/4d249173b34758e1d6c4a74eb98518d180f0a8ae.1649685475.git.jani.nikula@intel.com
Diffstat (limited to 'drivers/gpu/drm/drm_edid.c')
-rw-r--r--drivers/gpu/drm/drm_edid.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 202b54f95576..c50b2768d5d1 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -2102,11 +2102,11 @@ struct edid *drm_do_get_edid(struct drm_connector *connector,
{
enum edid_block_status status;
int j, invalid_blocks = 0;
- struct edid *edid, *new, *override;
+ struct edid *edid, *new;
- override = drm_get_override_edid(connector);
- if (override)
- return override;
+ edid = drm_get_override_edid(connector);
+ if (edid)
+ return edid;
edid = kmalloc(EDID_LENGTH, GFP_KERNEL);
if (!edid)