From 47c8e537d138f84d99b24ed7e4c52736b68214f1 Mon Sep 17 00:00:00 2001 From: Ken Pettit Date: Wed, 9 Jan 2019 07:24:58 -0600 Subject: [PATCH] drivers/mtd/s25fl1.c: Minor change for the s25fl1 QSPI FLASH driver which fixes additional sectorshift vs. pageshift confusion. --- drivers/mtd/s25fl1.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/mtd/s25fl1.c b/drivers/mtd/s25fl1.c index e9aaff4aa1..ceb011656b 100644 --- a/drivers/mtd/s25fl1.c +++ b/drivers/mtd/s25fl1.c @@ -1265,11 +1265,11 @@ static ssize_t s25fl1_bread(FAR struct mtd_dev_s *dev, off_t startblock, nbytes >>= S25FL1_SECTOR512_SHIFT; } #else - nbytes = s25fl1_read(dev, startblock << priv->sectorshift, - nblocks << priv->sectorshift, buffer); + nbytes = s25fl1_read(dev, startblock << priv->pageshift, + nblocks << priv->pageshift, buffer); if (nbytes > 0) { - nbytes >>= priv->sectorshift; + nbytes >>= priv->pageshift; } #endif @@ -1300,8 +1300,8 @@ static ssize_t s25fl1_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, } #else - ret = s25fl1_write_page(priv, buffer, startblock << priv->sectorshift, - nblocks << priv->sectorshift); + ret = s25fl1_write_page(priv, buffer, startblock << priv->pageshift, + nblocks << priv->pageshift); if (ret < 0) { ferr("ERROR: s25fl1_write_page failed: %d\n", ret);