diff options
author | Tony Lindgren <tony@atomide.com> | 2012-02-17 23:08:20 (GMT) |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-02-17 23:08:20 (GMT) |
commit | b0ee4e394009f02a1d1b166091a19e8b842b4ea4 (patch) | |
tree | 75e6df725e5402ed6fe9d78f23bf5cf45cfdf9d9 /drivers/mtd/mtdcore.c | |
parent | abe763f2bccbc592d33a3a9c334acaefea022c0a (diff) | |
parent | 03e4fd6eb25e6b46536ecdb0d1b7d33d46b15480 (diff) | |
download | linux-fsl-qoriq-b0ee4e394009f02a1d1b166091a19e8b842b4ea4.tar.xz |
Merge branch 'for_3.3/fixes/pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes
Diffstat (limited to 'drivers/mtd/mtdcore.c')
-rw-r--r-- | drivers/mtd/mtdcore.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 6ae9ca0..9a9ce71 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -119,7 +119,7 @@ static int mtd_cls_suspend(struct device *dev, pm_message_t state) { struct mtd_info *mtd = dev_get_drvdata(dev); - return mtd_suspend(mtd); + return mtd ? mtd_suspend(mtd) : 0; } static int mtd_cls_resume(struct device *dev) |