From 475be581da47595b76e5555029afdfbce37ba46f Mon Sep 17 00:00:00 2001 From: Russell King Date: Wed, 15 Feb 2012 11:48:34 +0000 Subject: [PATCH] --- yaml --- r: 298129 b: refs/heads/master c: 342d3a93e2b191b0ada07ba7c48380181c9214e8 h: refs/heads/master i: 298127: 644a4de1b0cbddf6b8ecf3b83793f1429652f817 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/chips/cfi_cmdset_0001.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c4fe8614ccb9..77b6033c0102 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 492b8bde2c2badd3e5845f2e8de6fa9065438743 +refs/heads/master: 342d3a93e2b191b0ada07ba7c48380181c9214e8 diff --git a/trunk/drivers/mtd/chips/cfi_cmdset_0001.c b/trunk/drivers/mtd/chips/cfi_cmdset_0001.c index 2d9669047ed4..920b474a5613 100644 --- a/trunk/drivers/mtd/chips/cfi_cmdset_0001.c +++ b/trunk/drivers/mtd/chips/cfi_cmdset_0001.c @@ -2479,7 +2479,7 @@ static int cfi_intelext_suspend(struct mtd_info *mtd) allowed to. Or should we return -EAGAIN, because the upper layers ought to have already shut down anything which was using the device anyway? The latter for now. */ - printk(KERN_NOTICE "Flash device refused suspend due to active operation (state %d)\n", chip->oldstate); + printk(KERN_NOTICE "Flash device refused suspend due to active operation (state %d)\n", chip->state); ret = -EAGAIN; case FL_PM_SUSPENDED: break;