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/hisi-sfc.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/hisi-sfc.c')
| -rw-r--r-- | drivers/mtd/spi-nor/hisi-sfc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/mtd/spi-nor/hisi-sfc.c b/drivers/mtd/spi-nor/hisi-sfc.c index 20378b0d55e9..a286350627a6 100644 --- a/drivers/mtd/spi-nor/hisi-sfc.c +++ b/drivers/mtd/spi-nor/hisi-sfc.c @@ -448,8 +448,11 @@ static int hisi_spi_nor_probe(struct platform_device *pdev) if (!host->buffer) return -ENOMEM; + ret = clk_prepare_enable(host->clk); + if (ret) + return ret; + mutex_init(&host->lock); - clk_prepare_enable(host->clk); hisi_spi_nor_init(host); ret = hisi_spi_nor_register_all(host); if (ret) |