diff options
| author | Allen Xu <b45815@freescale.com> | 2014-12-04 21:51:48 +0800 |
|---|---|---|
| committer | Allen Xu <b45815@freescale.com> | 2014-12-05 04:27:40 +0800 |
| commit | ccc6f0c4831e9576f9244554526b7561c813f909 (patch) | |
| tree | 17bf53f8e20c24c927628f232bb184a9098b459d | |
| parent | 25ecc09bb03eece78d6a236be1722e0d9a0d4540 (diff) | |
MLK-9957 mtd: NAND: fix the kernel panic issue for NAND suspend/resume
The branch determined by GPMI_IS_MX6SX() should not include
acquire_dma_channels() function which causes unbalanced dma
request/release on other platform.
Removed GPMI_IS_MX6SX() to make code simple although it is not necessary
to restore GPMI/BCH registers for i.MX6Q/DL
Signed-off-by: Allen Xu <b45815@freescale.com>
(cherry picked from commit 54cd0fe03180dc44e3783bca1546e61d698abd2f)
| -rw-r--r-- | drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c index 922c8797ebca..adcee1cbb0c5 100644 --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c @@ -1842,30 +1842,28 @@ static int gpmi_pm_resume(struct device *dev) struct gpmi_nand_data *this = dev_get_drvdata(dev); int ret; - if (GPMI_IS_MX6SX(this)) { - ret = acquire_dma_channels(this); - if (ret < 0) - return ret; - - /* re-init the GPMI registers */ - this->flags &= ~GPMI_TIMING_INIT_OK; - ret = gpmi_init(this); - if (ret) { - dev_err(this->dev, "Error setting GPMI : %d\n", ret); - return ret; - } + ret = acquire_dma_channels(this); + if (ret < 0) + return ret; - /* re-init the BCH registers */ - ret = bch_set_geometry(this); - if (ret) { - dev_err(this->dev, "Error setting BCH : %d\n", ret); - return ret; - } + /* re-init the GPMI registers */ + this->flags &= ~GPMI_TIMING_INIT_OK; + ret = gpmi_init(this); + if (ret) { + dev_err(this->dev, "Error setting GPMI : %d\n", ret); + return ret; + } - /* re-init others */ - gpmi_extra_init(this); + /* re-init the BCH registers */ + ret = bch_set_geometry(this); + if (ret) { + dev_err(this->dev, "Error setting BCH : %d\n", ret); + return ret; } + /* re-init others */ + gpmi_extra_init(this); + return 0; } |