From ae2e5a7bc4197758d65edc0c8e0800eb3158241e Mon Sep 17 00:00:00 2001 From: Laxman Dewangan Date: Tue, 10 Jul 2012 16:50:41 +0530 Subject: [PATCH] --- yaml --- r: 319159 b: refs/heads/master c: 9dce4bcaaabce28f7b188e4fa4fda3ea74ae5a0d h: refs/heads/master i: 319157: ee899fd2b029d7ec4c3e2d4ce85884ce31bec733 319155: a8ade273d2678306756b076e0428437227ed2b68 319151: b2a425e57a7e893e999c0ceca59ef0bdf04ca971 v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-tegra.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index eb768a29c005..dc44e2df5160 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 57c0dc3e69439a2ddf239226c318d676da773492 +refs/heads/master: 9dce4bcaaabce28f7b188e4fa4fda3ea74ae5a0d diff --git a/trunk/drivers/i2c/busses/i2c-tegra.c b/trunk/drivers/i2c/busses/i2c-tegra.c index e7738588a1e6..60d777027ce8 100644 --- a/trunk/drivers/i2c/busses/i2c-tegra.c +++ b/trunk/drivers/i2c/busses/i2c-tegra.c @@ -696,7 +696,7 @@ static int __devinit tegra_i2c_probe(struct platform_device *pdev) ret = i2c_add_numbered_adapter(&i2c_dev->adapter); if (ret) { dev_err(&pdev->dev, "Failed to add I2C adapter\n"); - clk_disable(i2c_dev->i2c_clk); + clk_disable_unprepare(i2c_dev->i2c_clk); return ret; }