From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754234AbeDZIfk (ORCPT ); Thu, 26 Apr 2018 04:35:40 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:51266 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753676AbeDZIfg (ORCPT ); Thu, 26 Apr 2018 04:35:36 -0400 X-Google-Smtp-Source: AB8JxZry467MSE8nZcAchKPq12wUs3DFMk8y7beegXU4ffmhkMnjwhqCnQJZDgzdNdD5LDsL9cW94g== Subject: Re: [PATCH] spi: meson-axg: Fix error handling in meson_spicc_probe() To: Alexey Khoroshilov , Mark Brown , Carlo Caione , Kevin Hilman Cc: linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, ldv-project@linuxtesting.org References: <1523655586-4163-1-git-send-email-khoroshilov@ispras.ru> From: Neil Armstrong Openpgp: preference=signencrypt Autocrypt: addr=narmstrong@baylibre.com; prefer-encrypt=mutual; keydata= xsBNBE1ZBs8BCAD78xVLsXPwV/2qQx2FaO/7mhWL0Qodw8UcQJnkrWmgTFRobtTWxuRx8WWP GTjuhvbleoQ5Cxjr+v+1ARGCH46MxFP5DwauzPekwJUD5QKZlaw/bURTLmS2id5wWi3lqVH4 BVF2WzvGyyeV1o4RTCYDnZ9VLLylJ9bneEaIs/7cjCEbipGGFlfIML3sfqnIvMAxIMZrvcl9 qPV2k+KQ7q+aXavU5W+yLNn7QtXUB530Zlk/d2ETgzQ5FLYYnUDAaRl+8JUTjc0CNOTpCeik 80TZcE6f8M76Xa6yU8VcNko94Ck7iB4vj70q76P/J7kt98hklrr85/3NU3oti3nrIHmHABEB AAHNKE5laWwgQXJtc3Ryb25nIDxuYXJtc3Ryb25nQGJheWxpYnJlLmNvbT7CwHsEEwEKACUC GyMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheABQJXDO2CAhkBAAoJEBaat7Gkz/iubGIH/iyk RqvgB62oKOFlgOTYCMkYpm2aAOZZLf6VKHKc7DoVwuUkjHfIRXdslbrxi4pk5VKU6ZP9AKsN NtMZntB8WrBTtkAZfZbTF7850uwd3eU5cN/7N1Q6g0JQihE7w4GlIkEpQ8vwSg5W7hkx3yQ6 2YzrUZh/b7QThXbNZ7xOeSEms014QXazx8+txR7jrGF3dYxBsCkotO/8DNtZ1R+aUvRfpKg5 ZgABTC0LmAQnuUUf2PHcKFAHZo5KrdO+tyfL+LgTUXIXkK+tenkLsAJ0cagz1EZ5gntuheLD YJuzS4zN+1Asmb9kVKxhjSQOcIh6g2tw7vaYJgL/OzJtZi6JlIXOwE0ETVkGzwEIALyKDN/O GURaHBVzwjgYq+ZtifvekdrSNl8TIDH8g1xicBYpQTbPn6bbSZbdvfeQPNCcD4/EhXZuhQXM coJsQQQnO4vwVULmPGgtGf8PVc7dxKOeta+qUh6+SRh3vIcAUFHDT3f/Zdspz+e2E0hPV2hi SvICLk11qO6cyJE13zeNFoeY3ggrKY+IzbFomIZY4yG6xI99NIPEVE9lNBXBKIlewIyVlkOa YvJWSV+p5gdJXOvScNN1epm5YHmf9aE2ZjnqZGoMMtsyw18YoX9BqMFInxqYQQ3j/HpVgTSv mo5ea5qQDDUaCsaTf8UeDcwYOtgI8iL4oHcsGtUXoUk33HEAEQEAAcLAXwQYAQIACQUCTVkG zwIbDAAKCRAWmrexpM/4rrXiB/sGbkQ6itMrAIfnM7IbRuiSZS1unlySUVYu3SD6YBYnNi3G 5EpbwfBNuT3H8//rVvtOFK4OD8cRYkxXRQmTvqa33eDIHu/zr1HMKErm+2SD6PO9umRef8V8 2o2oaCLvf4WeIssFjwB0b6a12opuRP7yo3E3gTCSKmbUuLv1CtxKQF+fUV1cVaTPMyT25Od+ RC1K+iOR0F54oUJvJeq7fUzbn/KdlhA8XPGzwGRy4zcsPWvwnXgfe5tk680fEKZVwOZKIEuJ C3v+/yZpQzDvGYJvbyix0lHnrCzq43WefRHI5XTTQbM0WUIBIcGmq38+OgUsMYu4NzLu7uZF Acmp6h8g Organization: Baylibre Message-ID: Date: Thu, 26 Apr 2018 10:35:33 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <1523655586-4163-1-git-send-email-khoroshilov@ispras.ru> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Alexey, On 13/04/2018 23:39, Alexey Khoroshilov wrote: > If devm_spi_register_master() fails in meson_spicc_probe(), > spicc->core is left undisabled. The patch fixes that. > > Found by Linux Driver Verification project (linuxtesting.org). > > Signed-off-by: Alexey Khoroshilov > --- > drivers/spi/spi-meson-spicc.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/drivers/spi/spi-meson-spicc.c b/drivers/spi/spi-meson-spicc.c > index 5c82910e3480..7fe4488ace57 100644 > --- a/drivers/spi/spi-meson-spicc.c > +++ b/drivers/spi/spi-meson-spicc.c > @@ -574,10 +574,15 @@ static int meson_spicc_probe(struct platform_device *pdev) > master->max_speed_hz = rate >> 2; > > ret = devm_spi_register_master(&pdev->dev, master); > - if (!ret) > - return 0; > + if (ret) { > + dev_err(&pdev->dev, "spi master registration failed\n"); > + goto out_clk; > + } > > - dev_err(&pdev->dev, "spi master registration failed\n"); > + return 0; > + > +out_clk: > + clk_disable_unprepare(spicc->core); > > out_master: > spi_master_put(master); > The correct subject should be "spi: meson-spicc:" Apart that : Reviewed-by: Neil Armstrong Neil From mboxrd@z Thu Jan 1 00:00:00 1970 From: narmstrong@baylibre.com (Neil Armstrong) Date: Thu, 26 Apr 2018 10:35:33 +0200 Subject: [PATCH] spi: meson-axg: Fix error handling in meson_spicc_probe() In-Reply-To: <1523655586-4163-1-git-send-email-khoroshilov@ispras.ru> References: <1523655586-4163-1-git-send-email-khoroshilov@ispras.ru> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Alexey, On 13/04/2018 23:39, Alexey Khoroshilov wrote: > If devm_spi_register_master() fails in meson_spicc_probe(), > spicc->core is left undisabled. The patch fixes that. > > Found by Linux Driver Verification project (linuxtesting.org). > > Signed-off-by: Alexey Khoroshilov > --- > drivers/spi/spi-meson-spicc.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/drivers/spi/spi-meson-spicc.c b/drivers/spi/spi-meson-spicc.c > index 5c82910e3480..7fe4488ace57 100644 > --- a/drivers/spi/spi-meson-spicc.c > +++ b/drivers/spi/spi-meson-spicc.c > @@ -574,10 +574,15 @@ static int meson_spicc_probe(struct platform_device *pdev) > master->max_speed_hz = rate >> 2; > > ret = devm_spi_register_master(&pdev->dev, master); > - if (!ret) > - return 0; > + if (ret) { > + dev_err(&pdev->dev, "spi master registration failed\n"); > + goto out_clk; > + } > > - dev_err(&pdev->dev, "spi master registration failed\n"); > + return 0; > + > +out_clk: > + clk_disable_unprepare(spicc->core); > > out_master: > spi_master_put(master); > The correct subject should be "spi: meson-spicc:" Apart that : Reviewed-by: Neil Armstrong Neil From mboxrd@z Thu Jan 1 00:00:00 1970 From: narmstrong@baylibre.com (Neil Armstrong) Date: Thu, 26 Apr 2018 10:35:33 +0200 Subject: [PATCH] spi: meson-axg: Fix error handling in meson_spicc_probe() In-Reply-To: <1523655586-4163-1-git-send-email-khoroshilov@ispras.ru> References: <1523655586-4163-1-git-send-email-khoroshilov@ispras.ru> Message-ID: To: linus-amlogic@lists.infradead.org List-Id: linus-amlogic.lists.infradead.org Hi Alexey, On 13/04/2018 23:39, Alexey Khoroshilov wrote: > If devm_spi_register_master() fails in meson_spicc_probe(), > spicc->core is left undisabled. The patch fixes that. > > Found by Linux Driver Verification project (linuxtesting.org). > > Signed-off-by: Alexey Khoroshilov > --- > drivers/spi/spi-meson-spicc.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/drivers/spi/spi-meson-spicc.c b/drivers/spi/spi-meson-spicc.c > index 5c82910e3480..7fe4488ace57 100644 > --- a/drivers/spi/spi-meson-spicc.c > +++ b/drivers/spi/spi-meson-spicc.c > @@ -574,10 +574,15 @@ static int meson_spicc_probe(struct platform_device *pdev) > master->max_speed_hz = rate >> 2; > > ret = devm_spi_register_master(&pdev->dev, master); > - if (!ret) > - return 0; > + if (ret) { > + dev_err(&pdev->dev, "spi master registration failed\n"); > + goto out_clk; > + } > > - dev_err(&pdev->dev, "spi master registration failed\n"); > + return 0; > + > +out_clk: > + clk_disable_unprepare(spicc->core); > > out_master: > spi_master_put(master); > The correct subject should be "spi: meson-spicc:" Apart that : Reviewed-by: Neil Armstrong Neil