aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorTobias Jakobi <tjakobi@math.uni-bielefeld.de>2016-05-25 14:30:07 +0200
committerInki Dae <daeinki@gmail.com>2016-06-19 14:37:28 +0900
commit41abbf5afa51136bcb2aeefc80bf5c3a005d0aa3 (patch)
tree4d250d7be7f9b252c452d9fb52379cb788077fd9 /drivers/gpu
parentdrm/exynos: remove superfluous inclusions of fbdev header (diff)
downloadlinux-dev-41abbf5afa51136bcb2aeefc80bf5c3a005d0aa3.tar.xz
linux-dev-41abbf5afa51136bcb2aeefc80bf5c3a005d0aa3.zip
drm/exynos: use logical AND in exynos_drm_plane_check_size()
The current bitwise AND should result in the same assembler but this is what the code is actually supposed to do. Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de> Signed-off-by: Inki Dae <inki.dae@samsung.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_plane.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c
index 55f1d37c666a..77f12c00abf9 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_plane.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c
@@ -242,7 +242,7 @@ exynos_drm_plane_check_size(const struct exynos_drm_plane_config *config,
state->v_ratio == (1 << 15))
height_ok = true;
- if (width_ok & height_ok)
+ if (width_ok && height_ok)
return 0;
DRM_DEBUG_KMS("scaling mode is not supported");