From ebd97dcf89abb0fbc75aa9b78442fd12cec6ba90 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 31 Aug 2015 10:18:50 -0600 Subject: [PATCH] ST25FL1: Make buffers all even multiple of 32-bit values --- arch | 2 +- drivers/mtd/st25fl1.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch b/arch index eaba40bd73..f33bbe8b35 160000 --- a/arch +++ b/arch @@ -1 +1 @@ -Subproject commit eaba40bd7303c737a812e307e2b687cd473d90da +Subproject commit f33bbe8b35c3c18c0f740a7f3c2e08557d996c63 diff --git a/drivers/mtd/st25fl1.c b/drivers/mtd/st25fl1.c index 85cc495ae7..d889d77bac 100644 --- a/drivers/mtd/st25fl1.c +++ b/drivers/mtd/st25fl1.c @@ -586,7 +586,7 @@ static void st25fl1_write_disable(FAR struct qspi_dev_s *qspi) * Name: st25fl1_write_status ************************************************************************************/ -static void st25fl1_write_status(FAR struct qspi_dev_s *qspi, uint8_t status[3]) +static void st25fl1_write_status(FAR struct qspi_dev_s *qspi, uint8_t status[4]) { st25fl1_write_enable(qspi); st25fl1_command_write(qspi, ST25FL1_WRITE_STATUS, (FAR const void *)status, 3); @@ -599,7 +599,7 @@ static void st25fl1_write_status(FAR struct qspi_dev_s *qspi, uint8_t status[3]) static inline int st25fl1_readid(struct st25fl1_dev_s *priv) { - uint8_t jedecid[3]; + uint8_t jedecid[4]; /* Lock the QuadSPI bus and configure the bus. */ @@ -663,7 +663,7 @@ static inline int st25fl1_readid(struct st25fl1_dev_s *priv) static int st25fl1_protect(FAR struct st25fl1_dev_s *priv, off_t startblock, size_t nblocks) { - unsigned char status[3]; + unsigned char status[4]; /* Get the status register value to check the current protection */ @@ -714,7 +714,7 @@ static int st25fl1_protect(FAR struct st25fl1_dev_s *priv, static int st25fl1_unprotect(FAR struct st25fl1_dev_s *priv, off_t startblock, size_t nblocks) { - unsigned char status[3]; + unsigned char status[4]; /* Get the status register value to check the current protection */ @@ -1435,7 +1435,7 @@ static int st25fl1_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) FAR struct mtd_dev_s *st25fl1_initialize(FAR struct qspi_dev_s *qspi) { FAR struct st25fl1_dev_s *priv; - uint8_t status[3]; + uint8_t status[4]; int ret; fvdbg("qspi: %p\n", qspi);