diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2017-05-02 03:08:10 +0300 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2017-05-02 03:08:10 +0300 |
| commit | 47228ca57e845d3d9196eb4e232b7cf6217a9beb (patch) | |
| tree | 04cbba672067e40eb11537a26e081c6175aaad20 /drivers/mtd/spi-nor/intel-spi.c | |
| parent | 57e363b8c45b6626b012f6ce39a2f70adf6b49fc (diff) | |
| parent | 8abe904dc82772bf1635fcc5765433c672f0a875 (diff) | |
| download | linux-47228ca57e845d3d9196eb4e232b7cf6217a9beb.tar.xz | |
Merge tag 'spi-nor/for-4.12-v2' of git://github.com/spi-nor/linux into MTD
From Cyrille:
"""
This pull request contains the following notable changes:
- fixes in the hisi SPI controller driver.
- fixes in the intel SPI controller driver.
- fixes in the Mediatek SPI controller driver.
- fixes to some SPI flash memories not supported the Chip Erase command.
- add support to some new memory parts (Winbond, Macronix, Micron, ESMT).
- add new driver for the STM32 QSPI controller.
"""
Diffstat (limited to 'drivers/mtd/spi-nor/intel-spi.c')
| -rw-r--r-- | drivers/mtd/spi-nor/intel-spi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/spi-nor/intel-spi.c b/drivers/mtd/spi-nor/intel-spi.c index a10f6027b386..986a3d020a3a 100644 --- a/drivers/mtd/spi-nor/intel-spi.c +++ b/drivers/mtd/spi-nor/intel-spi.c @@ -704,7 +704,7 @@ static void intel_spi_fill_partition(struct intel_spi *ispi, * whole partition read-only to be on the safe side. */ if (intel_spi_is_protected(ispi, base, limit)) - ispi->writeable = 0; + ispi->writeable = false; end = (limit << 12) + 4096; if (end > part->size) @@ -728,7 +728,7 @@ struct intel_spi *intel_spi_probe(struct device *dev, ispi->base = devm_ioremap_resource(dev, mem); if (IS_ERR(ispi->base)) - return ispi->base; + return ERR_CAST(ispi->base); ispi->dev = dev; ispi->info = info; |