Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 298129
b: refs/heads/master
c: 342d3a9
h: refs/heads/master
i:
  298127: 644a4de
v: v3
  • Loading branch information
Russell King authored and David Woodhouse committed Mar 26, 2012
1 parent 7f4dfc0 commit 475be58
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 492b8bde2c2badd3e5845f2e8de6fa9065438743
refs/heads/master: 342d3a93e2b191b0ada07ba7c48380181c9214e8
2 changes: 1 addition & 1 deletion trunk/drivers/mtd/chips/cfi_cmdset_0001.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 475be58

Please sign in to comment.