Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751677AbdIJNzh (ORCPT ); Sun, 10 Sep 2017 09:55:37 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:33029 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750967AbdIJNzf (ORCPT ); Sun, 10 Sep 2017 09:55:35 -0400 X-Google-Smtp-Source: AOwi7QAauTCx9BCTEuZ3cq8J00MQbvTerdhDccD6SL0+JcyMMk+7P7DA9vq7BiF/y50rarpIfijJTA== From: Christos Gkekas To: Amelie Delaunay , Mark Brown , Maxime Coquelin , Alexandre Torgue , linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Christos Gkekas Subject: [PATCH] spi: stm32: Fix logical error in stm32_spi_prepare_mbr() Date: Sun, 10 Sep 2017 14:55:29 +0100 Message-Id: <1505051729-22270-1-git-send-email-chris.gekas@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 899 Lines: 26 stm32_spi_prepare_mbr() is returning an error value when div is less than SPI_MBR_DIV_MIN *and* greater than SPI_MBR_DIV_MAX, which always evaluates to false. This should change to use *or*. Signed-off-by: Christos Gkekas --- drivers/spi/spi-stm32.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-stm32.c b/drivers/spi/spi-stm32.c index 680cdf5..ba9743f 100644 --- a/drivers/spi/spi-stm32.c +++ b/drivers/spi/spi-stm32.c @@ -263,8 +263,8 @@ static int stm32_spi_prepare_mbr(struct stm32_spi *spi, u32 speed_hz) * no need to check it there. * However, we need to ensure the following calculations. */ - if ((div < SPI_MBR_DIV_MIN) && - (div > SPI_MBR_DIV_MAX)) + if (div < SPI_MBR_DIV_MIN || + div > SPI_MBR_DIV_MAX) return -EINVAL; /* Determine the first power of 2 greater than or equal to div */ -- 2.7.4