Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 274773
b: refs/heads/master
c: 1676bc1
h: refs/heads/master
i:
  274771: 29fc1d9
v: v3
  • Loading branch information
Axel Lin authored and Artem Bityutskiy committed Sep 11, 2011
1 parent 549ff79 commit efa82ca
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 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: 7578ca927b1a2a0445c9a3166d05462b9ffd4c06
refs/heads/master: 1676bc18c6648c378029dad365756e12be7da025
2 changes: 0 additions & 2 deletions trunk/drivers/mtd/nand/pxa3xx_nand.c
Original file line number Diff line number Diff line change
Expand Up @@ -1164,7 +1164,6 @@ static int pxa3xx_nand_probe(struct platform_device *pdev)
static int pxa3xx_nand_suspend(struct platform_device *pdev, pm_message_t state)
{
struct pxa3xx_nand_info *info = platform_get_drvdata(pdev);
struct mtd_info *mtd = info->mtd;

if (info->state) {
dev_err(&pdev->dev, "driver busy, state = %d\n", info->state);
Expand All @@ -1177,7 +1176,6 @@ static int pxa3xx_nand_suspend(struct platform_device *pdev, pm_message_t state)
static int pxa3xx_nand_resume(struct platform_device *pdev)
{
struct pxa3xx_nand_info *info = platform_get_drvdata(pdev);
struct mtd_info *mtd = info->mtd;

nand_writel(info, NDTR0CS0, info->ndtr0cs0);
nand_writel(info, NDTR1CS0, info->ndtr1cs0);
Expand Down

0 comments on commit efa82ca

Please sign in to comment.