diff options
| author | Greg Kroah-Hartman | 2016-07-04 17:17:08 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2016-07-04 17:17:08 +0200 |
| commit | 67417f9c262e2cd4b706eba3e1fd879d0bebc6d8 (patch) | |
| tree | 5ab867187357c4c0e23e409f42f0e0dff63d6fa8 /drivers/gpu/drm/exynos/exynos_drm_plane.c | |
| parent | tty/serial: atmel: enforce tasklet init and termination sequences (diff) | |
| parent | Linux 4.7-rc6 (diff) | |
| download | kernel-qcow2-linux-67417f9c262e2cd4b706eba3e1fd879d0bebc6d8.tar.gz kernel-qcow2-linux-67417f9c262e2cd4b706eba3e1fd879d0bebc6d8.tar.xz kernel-qcow2-linux-67417f9c262e2cd4b706eba3e1fd879d0bebc6d8.zip | |
Merge 4.7-rc6 into tty-next
We want the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos_drm_plane.c')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 |
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"); |