From e1855579b8a324a662254711cabad81ab16af9ba Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Mon, 16 Jan 2012 11:07:16 +0200 Subject: [PATCH] --- yaml --- r: 287203 b: refs/heads/master c: 1a30871fe635d3e92972e6b93e39ff65bb57e52d h: refs/heads/master i: 287201: dfa51c871115b323067caff549d57bc7175eaff6 287199: f4a6509c4c4219575d2585d6612bf7d39b8b98c3 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/mtdcore.c | 2 +- trunk/include/linux/mtd/mtd.h | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9786cb4c106e..afdb1d223431 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bce41d601e58af12cee1398fe836e6b9a8fb5396 +refs/heads/master: 1a30871fe635d3e92972e6b93e39ff65bb57e52d diff --git a/trunk/drivers/mtd/mtdcore.c b/trunk/drivers/mtd/mtdcore.c index 6ae9ca01388b..9a9ce71a71fc 100644 --- a/trunk/drivers/mtd/mtdcore.c +++ b/trunk/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) diff --git a/trunk/include/linux/mtd/mtd.h b/trunk/include/linux/mtd/mtd.h index 1a81fde8f333..d8c7aad7331c 100644 --- a/trunk/include/linux/mtd/mtd.h +++ b/trunk/include/linux/mtd/mtd.h @@ -427,9 +427,7 @@ static inline int mtd_is_locked(struct mtd_info *mtd, loff_t ofs, uint64_t len) static inline int mtd_suspend(struct mtd_info *mtd) { - if (!mtd->suspend) - return -EOPNOTSUPP; - return mtd->suspend(mtd); + return mtd->suspend ? mtd->suspend(mtd) : 0; } static inline void mtd_resume(struct mtd_info *mtd)