Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 296374
b: refs/heads/master
c: a4b54ac
h: refs/heads/master
v: v3
  • Loading branch information
Russell King committed Feb 18, 2012
1 parent 0ecdccd commit 1633f0a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2b4d9d2b001be2ff06be2ea5c52e9adaf85b0805
refs/heads/master: a4b54acf9e691a3051950444d33980741e7d63a8
7 changes: 7 additions & 0 deletions trunk/drivers/mfd/mcp-sa11x0.c
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,10 @@ static int mcp_sa11x0_remove(struct platform_device *dev)
struct mcp_sa11x0 *m = priv(mcp);
struct resource *mem0, *mem1;

if (m->mccr0 & MCCR0_MCE)
dev_warn(&dev->dev,
"device left active (missing disable call?)\n");

mem0 = platform_get_resource(dev, IORESOURCE_MEM, 0);
mem1 = platform_get_resource(dev, IORESOURCE_MEM, 1);

Expand All @@ -271,6 +275,9 @@ static int mcp_sa11x0_suspend(struct device *dev)
{
struct mcp_sa11x0 *m = priv(dev_get_drvdata(dev));

if (m->mccr0 & MCCR0_MCE)
dev_warn(dev, "device left active (missing disable call?)\n");

writel(m->mccr0 & ~MCCR0_MCE, MCCR0(m));

return 0;
Expand Down

0 comments on commit 1633f0a

Please sign in to comment.