Patchwork PM / MTD: Fix regressions related to mtd_suspend()

login
register
mail settings
Submitter Rafael J. Wysocki
Date Jan. 15, 2012, 1:43 p.m.
Message ID <201201151443.30897.rjw@sisk.pl>
Download mbox | patch
Permalink /patch/136184/
State New
Headers show

Comments

Rafael J. Wysocki - Jan. 15, 2012, 1:43 p.m.
From: Rafael J. Wysocki <rjw@sisk.pl>

Commit 3fe4bae88460869a8e553397cd9057a4ee7ca341 (mtd: introduce
mtd_suspend interface) introduced the mtd_suspend() routine
which didn't check whether or not mtd and mtd->suspend were
both valid pointers.  Later commit 079c985e7a6f4ce60f931cebfdd5ee3c3
(mtd: do not use mtd->suspend and mtd->resume directly) added the
check for mtd->suspend, but still it failed to check mtd.  Moreover,
it caused mtd_suspend() to return an error code for NULL
mtd->suspend, which makes system suspend fail on one of my test
systems on every attempt and which is a regression from v3.2.

Fix mtd_suspend() by making it check if mtd is not NULL and
return 0 if mtd or mtd->suspend is NULL, which shouldn't prevent
the system from suspending.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
 include/linux/mtd/mtd.h |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Patch

Index: linux/include/linux/mtd/mtd.h
===================================================================
--- linux.orig/include/linux/mtd/mtd.h
+++ linux/include/linux/mtd/mtd.h
@@ -427,9 +427,7 @@  static inline int mtd_is_locked(struct m
 
 static inline int mtd_suspend(struct mtd_info *mtd)
 {
-	if (!mtd->suspend)
-		return -EOPNOTSUPP;
-	return mtd->suspend(mtd);
+	return mtd && mtd->suspend ? mtd->suspend(mtd) : 0;
 }
 
 static inline void mtd_resume(struct mtd_info *mtd)