From: Ramon Fried Date: Wed, 16 May 2018 12:13:37 +0300 Subject: [U-Boot] [PATCH v2 2/7] serial: serial_msm: fail probe if settings clocks fails In-Reply-To: <20180516091342.7509-1-ramon.fried@gmail.com> References: <20180516091342.7509-1-ramon.fried@gmail.com> Message-ID: <20180516091342.7509-2-ramon.fried@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Failure to set the clocks will causes data abort exception when trying to write to AHB uart registers. This patch ensures that we don't touch these registers if clock setting failed. Signed-off-by: Ramon Fried --- v2: on failure, return actual return code from msm_uart_clk_init drivers/serial/serial_msm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/serial/serial_msm.c b/drivers/serial/serial_msm.c index 119e6b9846..8b585deeeb 100644 --- a/drivers/serial/serial_msm.c +++ b/drivers/serial/serial_msm.c @@ -181,10 +181,12 @@ static int msm_uart_clk_init(struct udevice *dev) static int msm_serial_probe(struct udevice *dev) { + int ret; struct msm_serial_data *priv = dev_get_priv(dev); - msm_uart_clk_init(dev); /* Ignore return value and hope clock was - properly initialized by earlier loaders */ + ret = msm_uart_clk_init(dev); + if (ret) + return ret; if (readl(priv->base + UARTDM_SR) & UARTDM_SR_UART_OVERRUN) writel(UARTDM_CR_CMD_RESET_ERR, priv->base + UARTDM_CR); -- 2.17.0