---

yaml --- r: 319159 b: refs/heads/master c: 9dce4bc h: refs/heads/master i: 319157: ee899fd 319155: a8ade27 319151: b2a425e v: v3
git-mirror · Jul 12, 2012 · ae2e5a7 · ae2e5a7
1 parent 425a150
commit ae2e5a7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
 	}