diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-11-27 15:41:11 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-11-27 15:41:11 +0300 |
| commit | 3fb42daaf11c4be8e0626b733916f3a7b65bcfae (patch) | |
| tree | d40ab1904047d2db03c9f6e9b538e01d62415646 /drivers/mtd/nand/nand_base.c | |
| parent | efdbe3c3edb6c8c98a8be863f60916780a5375c1 (diff) | |
| parent | 06a691e64b11323a735db3c3bd909d3c0712698f (diff) | |
| download | linux-3fb42daaf11c4be8e0626b733916f3a7b65bcfae.tar.xz | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'drivers/mtd/nand/nand_base.c')
| -rw-r--r-- | drivers/mtd/nand/nand_base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index cc74142938b0..ece544efccc3 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -3110,7 +3110,7 @@ static void nand_resume(struct mtd_info *mtd) */ static void nand_shutdown(struct mtd_info *mtd) { - nand_get_device(mtd, FL_SHUTDOWN); + nand_get_device(mtd, FL_PM_SUSPENDED); } /* Set default functions */ |