diff options
| author | Artem Bityutskiy | 2012-01-16 10:07:16 +0100 |
|---|---|---|
| committer | David Woodhouse | 2012-01-30 15:23:07 +0100 |
| commit | 1a30871fe635d3e92972e6b93e39ff65bb57e52d (patch) | |
| tree | a9b1dec4e9ab56faba549e7b1a1cec2cbe22b111 /drivers/mtd | |
| parent | jffs2: do not initialize variable unnecessarily (diff) | |
| download | kernel-qcow2-linux-1a30871fe635d3e92972e6b93e39ff65bb57e52d.tar.gz kernel-qcow2-linux-1a30871fe635d3e92972e6b93e39ff65bb57e52d.tar.xz kernel-qcow2-linux-1a30871fe635d3e92972e6b93e39ff65bb57e52d.zip | |
mtd: fix MTD suspend
Commits 3fe4bae88460869a8e553397cd9057a4ee7ca341 and
079c985e7a6f4ce60f931cebfdd5ee3c3 broke MTD suspend in 2 ways:
1. When the '->suspend' method is not present, we return -EOPNOTSUPP, but
the callers of 'mtd_suspend()' expects 0 instead.
2. Checking of the 'mtd' parameter against NULL has been incorrectly removed
in 'mtd_cls_suspend()'.
This patch fixes the breakages. This has been found, analyzed, reported
and tested by Rafael J. Wysocki <rjw@sisk.pl>.
Note, this patch is not needed in the stable tree because it causes a
regression introduced during the v3.3 merge window.
Reported-by: Rafael J. Wysocki <rjw@sisk.pl>
Tested-by: Rafael J. Wysocki <rjw@sisk.pl>
Tested-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd')
| -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 6ae9ca01388b..9a9ce71a71fc 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) |