From: Heinrich Schuchardt Date: Wed, 31 Jan 2018 00:05:54 +0000 (+0100) Subject: atcspi200: avoid possible NULL dereference X-Git-Tag: v2018.03-rc2~28 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=923837e159c5886be38c7a83a2d6bc489b35c1f4;p=u-boot atcspi200: avoid possible NULL dereference Check if ns before and not after dereferencing it. Indicated by cppcheck. Signed-off-by: Heinrich Schuchardt --- diff --git a/drivers/spi/atcspi200_spi.c b/drivers/spi/atcspi200_spi.c index 3e29df03a4..5b2e9d6264 100644 --- a/drivers/spi/atcspi200_spi.c +++ b/drivers/spi/atcspi200_spi.c @@ -297,6 +297,8 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, return NULL; ns = spi_alloc_slave(struct nds_spi_slave, bus, cs); + if (!ns) + return NULL; switch (bus) { case SPI0_BUS: @@ -316,8 +318,6 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, ns->to = SPI_TIMEOUT; ns->max_transfer_length = MAX_TRANSFER_LEN; ns->slave.max_write_size = MAX_TRANSFER_LEN; - if (!ns) - return NULL; return &ns->slave; }