diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-01-16 03:15:03 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-01-16 10:42:08 +0100 |
| commit | 4e87f2dd9bc258c85b2f3bb1a100b49927fbe6f3 (patch) | |
| tree | 96c82edf20e2c28e8fc4d97438d00e3b18b8afe9 /drivers/video/tegra/dc | |
| parent | fe4c58c4b96a24aba8e27956e8158b3002723b17 (diff) | |
| parent | c7460e0d6afd754ebf5555477129579bc83c47b9 (diff) | |
Merge remote-tracking branch 'remotes/nvidia/l4t/l4t-r16-r2' into tegra-next
(tegra-l4t-r16-16.5)
Conflicts:
drivers/media/video/tegra_v4l2_camera.c
drivers/mmc/host/sdhci.c
drivers/watchdog/tegra_wdt.c
include/media/tegra_v4l2_camera.h
Diffstat (limited to 'drivers/video/tegra/dc')
| -rw-r--r-- | drivers/video/tegra/dc/hdmi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/tegra/dc/hdmi.c b/drivers/video/tegra/dc/hdmi.c index e5e6fff7eb46..85a5d63e9326 100644 --- a/drivers/video/tegra/dc/hdmi.c +++ b/drivers/video/tegra/dc/hdmi.c @@ -4,7 +4,7 @@ * Copyright (C) 2010 Google, Inc. * Author: Erik Gilling <konkers@android.com> * - * Copyright (c) 2010-2012, NVIDIA CORPORATION, All rights reserved. + * Copyright (c) 2010-2013, NVIDIA CORPORATION, All rights reserved. * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and @@ -1262,7 +1262,8 @@ static bool tegra_dc_hdmi_valid_asp_ratio(const struct tegra_dc *dc, return false; /* To check the aspect upto two decimal digits, calculate in % */ - m_aspratio = (mode->xres*100 / mode->yres); + if (mode->yres) + m_aspratio = (mode->xres*100 / mode->yres); if ((m_aspratio < TEGRA_DC_HDMI_MIN_ASPECT_RATIO_PERCENT) || (m_aspratio > TEGRA_DC_HDMI_MAX_ASPECT_RATIO_PERCENT)) |