From 4ab7ab03eff0d90d00d0216ee30cb6bc6e9dc584 Mon Sep 17 00:00:00 2001 From: jflyper Date: Sun, 27 Jan 2019 00:36:52 +0900 Subject: [PATCH] Protect flashInit from NULL SPI instance --- src/main/drivers/flash.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/drivers/flash.c b/src/main/drivers/flash.c index e1d2eed2b8..fefae067d8 100644 --- a/src/main/drivers/flash.c +++ b/src/main/drivers/flash.c @@ -62,7 +62,13 @@ bool flashInit(const flashConfig_t *flashConfig) } busdev->bustype = BUSTYPE_SPI; - spiBusSetInstance(busdev, spiInstanceByDevice(SPI_CFG_TO_DEV(flashConfig->spiDevice))); + + SPI_TypeDef *instance = spiInstanceByDevice(SPI_CFG_TO_DEV(flashConfig->spiDevice)); + if (!instance) { + return false; + } + + spiBusSetInstance(busdev, instance); IOInit(busdev->busdev_u.spi.csnPin, OWNER_FLASH_CS, 0); IOConfigGPIO(busdev->busdev_u.spi.csnPin, SPI_IO_CS_CFG);