diff mbox series

[U-Boot] spi: soft_spi: Fix data abort if slave is not probed

Message ID 20190802134629.12749-1-patrice.chotard@st.com
State Accepted
Commit dfe72d081d4eda0c0788dc5db69de3abbec1b857
Delegated to: Jagannadha Sutradharudu Teki
Headers show
Series [U-Boot] spi: soft_spi: Fix data abort if slave is not probed | expand

Commit Message

Patrice CHOTARD Aug. 2, 2019, 1:46 p.m. UTC 
From: Christophe Kerello <christophe.kerello@st.com>

In case spi_get_bus_and_cs callback is used, spi bus is first probed
then slave devices are probed. To avoid a data abort in soft_spi probe
function, we need to check that (slave != NULL).

If slave is NULL, cs_flags and clk_flags will be initialized with
respectively GPIOD_ACTIVE_LOW and 0.

Signed-off-by: Christophe Kerello <christophe.kerello@st.com>
Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
---

 drivers/spi/soft_spi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Jagan Teki Sept. 6, 2019, 6:37 p.m. UTC | #1 
On Fri, Aug 2, 2019 at 7:16 PM Patrice Chotard <patrice.chotard@st.com> wrote:
>
> From: Christophe Kerello <christophe.kerello@st.com>
>
> In case spi_get_bus_and_cs callback is used, spi bus is first probed
> then slave devices are probed. To avoid a data abort in soft_spi probe
> function, we need to check that (slave != NULL).
>
> If slave is NULL, cs_flags and clk_flags will be initialized with
> respectively GPIOD_ACTIVE_LOW and 0.
>
> Signed-off-by: Christophe Kerello <christophe.kerello@st.com>
> Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
> ---

Applied to u-boot-spi/master
diff mbox series

Patch

diff --git a/drivers/spi/soft_spi.c b/drivers/spi/soft_spi.c
index b06883f9d0..b80f810bd1 100644
--- a/drivers/spi/soft_spi.c
+++ b/drivers/spi/soft_spi.c
@@ -215,8 +215,8 @@  static int soft_spi_probe(struct udevice *dev)
 	int cs_flags, clk_flags;
 	int ret;
 
-	cs_flags = (slave->mode & SPI_CS_HIGH) ? 0 : GPIOD_ACTIVE_LOW;
-	clk_flags = (slave->mode & SPI_CPOL) ? GPIOD_ACTIVE_LOW : 0;
+	cs_flags = (slave && slave->mode & SPI_CS_HIGH) ? 0 : GPIOD_ACTIVE_LOW;
+	clk_flags = (slave && slave->mode & SPI_CPOL) ? GPIOD_ACTIVE_LOW : 0;
 
 	if (gpio_request_by_name(dev, "cs-gpios", 0, &plat->cs,
 				 GPIOD_IS_OUT | cs_flags) ||