openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

MFD: ucb1x00-core: disable mcp clock when bus is not required 

The ucb1x00-core was leaving the mcp clock enabled indefinitely after
probe.  This needlessly wastes power.  Add the necessary disables to
ensure that the clock remains off when we don't need it.

Acked-by: Jochen Friedrich <jochen@scram.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2012-01-21 18:24:17 +00:00
parent ed442b6798
commit 2b4d9d2b00
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/mfd/ucb1x00-core.c
View File

@ -554,16 +554,17 @@ static int ucb1x00_probe(struct mcp *mcp)
mcp_enable(mcp);
id = mcp_reg_read(mcp, UCB_ID);
mcp_disable(mcp);
if (id != UCB_ID_1200 && id != UCB_ID_1300 && id != UCB_ID_TC35143) {
printk(KERN_WARNING "UCB1x00 ID not found: %04x\n", id);
goto err_disable;
goto out;
}
ucb = kzalloc(sizeof(struct ucb1x00), GFP_KERNEL);
ret = -ENOMEM;
if (!ucb)
goto err_disable;
goto out;
device_initialize(&ucb->dev);
ucb->dev.class = &ucb1x00_class;
@ -581,7 +582,9 @@ static int ucb1x00_probe(struct mcp *mcp)
if (ret)
goto err_dev_add;
ucb1x00_enable(ucb);
ucb->irq = ucb1x00_detect_irq(ucb);
ucb1x00_disable(ucb);
if (ucb->irq == NO_IRQ) {
dev_err(&ucb->dev, "IRQ probe failed\n");
ret = -ENODEV;
@ -633,8 +636,6 @@ static int ucb1x00_probe(struct mcp *mcp)
device_del(&ucb->dev);
err_dev_add:
put_device(&ucb->dev);
err_disable:
mcp_disable(mcp);
out:
if (pdata && pdata->reset)
pdata->reset(UCB_RST_PROBE_FAIL);