summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Zhao <bernard@vivo.com>2020-11-18 14:40:19 +0300
committerDaniel Vetter <daniel.vetter@ffwll.ch>2020-11-19 00:27:49 +0300
commit58a74c6f1d6f3cf615c8f12281d42859ac7363a9 (patch)
tree004c4725d9a9a7fc4b2a60c9291c470ef62f930f
parentb1246bd4a18b50c0f424a877ab64605ce8ebad86 (diff)
downloadlinux-58a74c6f1d6f3cf615c8f12281d42859ac7363a9.tar.xz
drm/via: fix assignment in if condition
Fix check_patch.pl warning: ERROR: do not use assignment in if condition + if ((HALCYON_HEADER2 == (cmd = *buf)) && ERROR: do not use assignment in if condition + if (HALCYON_HEADER2 == (cmd = *buf)) Signed-off-by: Bernard Zhao <bernard@vivo.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: https://patchwork.freedesktop.org/patch/msgid/20201118114021.105502-1-bernard@vivo.com
-rw-r--r--drivers/gpu/drm/via/via_verifier.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/via/via_verifier.c b/drivers/gpu/drm/via/via_verifier.c
index 8d8135f424ef..3d6e3a70f318 100644
--- a/drivers/gpu/drm/via/via_verifier.c
+++ b/drivers/gpu/drm/via/via_verifier.c
@@ -1001,8 +1001,8 @@ via_verify_command_stream(const uint32_t * buf, unsigned int size,
state = via_check_vheader6(&buf, buf_end);
break;
case state_command:
- if ((HALCYON_HEADER2 == (cmd = *buf)) &&
- supported_3d)
+ cmd = *buf;
+ if ((cmd == HALCYON_HEADER2) && supported_3d)
state = state_header2;
else if ((cmd & HALCYON_HEADER1MASK) == HALCYON_HEADER1)
state = state_header1;
@@ -1064,7 +1064,8 @@ via_parse_command_stream(struct drm_device *dev, const uint32_t *buf,
state = via_parse_vheader6(dev_priv, &buf, buf_end);
break;
case state_command:
- if (HALCYON_HEADER2 == (cmd = *buf))
+ cmd = *buf;
+ if (cmd == HALCYON_HEADER2)
state = state_header2;
else if ((cmd & HALCYON_HEADER1MASK) == HALCYON_HEADER1)
state = state_header1;