aboutsummaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorGreg Hackmann <ghackmann@google.com>2014-12-16 15:59:51 -0800
committerJohn Stultz <john.stultz@linaro.org>2015-11-19 12:38:19 -0800
commit43fbe0ca749fe24cb17cd16a099bd858ed119604 (patch)
treead304daa6f0c2148f8fa013a28db3954f8dc5670 /drivers/video
parentace376aaa841e9dfd952165a4d244e3844d74a31 (diff)
downloadv4.1-43fbe0ca749fe24cb17cd16a099bd858ed119604.tar.gz
video: adf: fix wrong bitops in adf_modeinfo_to_fb_videomode()
Change-Id: I1296153e382c0b66b713a0e7d09665ed5961f13d Signed-off-by: Greg Hackmann <ghackmann@google.com> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/adf/adf_fbdev.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/adf/adf_fbdev.c b/drivers/video/adf/adf_fbdev.c
index 9d3c245850a..a5b53bc08c3 100644
--- a/drivers/video/adf/adf_fbdev.c
+++ b/drivers/video/adf/adf_fbdev.c
@@ -136,13 +136,13 @@ void adf_modeinfo_to_fb_videomode(const struct drm_mode_modeinfo *mode,
vmode->vsync_len = mode->vsync_end - mode->vsync_start;
vmode->sync = 0;
- if (mode->flags | DRM_MODE_FLAG_PHSYNC)
+ if (mode->flags & DRM_MODE_FLAG_PHSYNC)
vmode->sync |= FB_SYNC_HOR_HIGH_ACT;
- if (mode->flags | DRM_MODE_FLAG_PVSYNC)
+ if (mode->flags & DRM_MODE_FLAG_PVSYNC)
vmode->sync |= FB_SYNC_VERT_HIGH_ACT;
- if (mode->flags | DRM_MODE_FLAG_PCSYNC)
+ if (mode->flags & DRM_MODE_FLAG_PCSYNC)
vmode->sync |= FB_SYNC_COMP_HIGH_ACT;
- if (mode->flags | DRM_MODE_FLAG_BCAST)
+ if (mode->flags & DRM_MODE_FLAG_BCAST)
vmode->sync |= FB_SYNC_BROADCAST;
vmode->vmode = 0;