Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
i2c
/
busses
/
i2c-exynos5.c
diff --git
a/kernel/drivers/i2c/busses/i2c-exynos5.c
b/kernel/drivers/i2c/busses/i2c-exynos5.c
index
b29c750
..
f54ece8
100644
(file)
--- a/
kernel/drivers/i2c/busses/i2c-exynos5.c
+++ b/
kernel/drivers/i2c/busses/i2c-exynos5.c
@@
-671,7
+671,9
@@
static int exynos5_i2c_xfer(struct i2c_adapter *adap,
return -EIO;
}
return -EIO;
}
- clk_prepare_enable(i2c->clk);
+ ret = clk_enable(i2c->clk);
+ if (ret)
+ return ret;
for (i = 0; i < num; i++, msgs++) {
stop = (i == num - 1);
for (i = 0; i < num; i++, msgs++) {
stop = (i == num - 1);
@@
-695,7
+697,7
@@
static int exynos5_i2c_xfer(struct i2c_adapter *adap,
}
out:
}
out:
- clk_disable
_unprepare
(i2c->clk);
+ clk_disable(i2c->clk);
return ret;
}
return ret;
}
@@
-747,7
+749,9
@@
static int exynos5_i2c_probe(struct platform_device *pdev)
return -ENOENT;
}
return -ENOENT;
}
- clk_prepare_enable(i2c->clk);
+ ret = clk_prepare_enable(i2c->clk);
+ if (ret)
+ return ret;
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
i2c->regs = devm_ioremap_resource(&pdev->dev, mem);
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
i2c->regs = devm_ioremap_resource(&pdev->dev, mem);
@@
-799,6
+803,10
@@
static int exynos5_i2c_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, i2c);
platform_set_drvdata(pdev, i2c);
+ clk_disable(i2c->clk);
+
+ return 0;
+
err_clk:
clk_disable_unprepare(i2c->clk);
return ret;
err_clk:
clk_disable_unprepare(i2c->clk);
return ret;
@@
-810,6
+818,8
@@
static int exynos5_i2c_remove(struct platform_device *pdev)
i2c_del_adapter(&i2c->adap);
i2c_del_adapter(&i2c->adap);
+ clk_unprepare(i2c->clk);
+
return 0;
}
return 0;
}
@@
-821,6
+831,8
@@
static int exynos5_i2c_suspend_noirq(struct device *dev)
i2c->suspended = 1;
i2c->suspended = 1;
+ clk_unprepare(i2c->clk);
+
return 0;
}
return 0;
}
@@
-830,7
+842,9
@@
static int exynos5_i2c_resume_noirq(struct device *dev)
struct exynos5_i2c *i2c = platform_get_drvdata(pdev);
int ret = 0;
struct exynos5_i2c *i2c = platform_get_drvdata(pdev);
int ret = 0;
- clk_prepare_enable(i2c->clk);
+ ret = clk_prepare_enable(i2c->clk);
+ if (ret)
+ return ret;
ret = exynos5_hsi2c_clock_setup(i2c);
if (ret) {
ret = exynos5_hsi2c_clock_setup(i2c);
if (ret) {
@@
-839,7
+853,7
@@
static int exynos5_i2c_resume_noirq(struct device *dev)
}
exynos5_i2c_init(i2c);
}
exynos5_i2c_init(i2c);
- clk_disable
_unprepare
(i2c->clk);
+ clk_disable(i2c->clk);
i2c->suspended = 0;
return 0;
i2c->suspended = 0;
return 0;