diff options
| author | Michael Turquette | 2015-03-25 00:33:33 +0100 |
|---|---|---|
| committer | Michael Turquette | 2015-03-25 00:47:43 +0100 |
| commit | c77662a4df847e7b75ff8c5f2314dd4f022377e3 (patch) | |
| tree | fbf34d2f4c260bc413d51b1591f21854532f67b7 /drivers/clk/ti/clk.c | |
| parent | clk: qcom: Add MSM8916 Global Clock Controller support (diff) | |
| parent | clk: ti: Implement FAPLL set_rate for the PLL (diff) | |
| download | kernel-qcow2-linux-c77662a4df847e7b75ff8c5f2314dd4f022377e3.tar.gz kernel-qcow2-linux-c77662a4df847e7b75ff8c5f2314dd4f022377e3.tar.xz kernel-qcow2-linux-c77662a4df847e7b75ff8c5f2314dd4f022377e3.zip | |
Merge branch 'for-4.1-clk-ti' of github.com:t-kristo/linux-pm into clk-next
Diffstat (limited to 'drivers/clk/ti/clk.c')
| -rw-r--r-- | drivers/clk/ti/clk.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/clk/ti/clk.c b/drivers/clk/ti/clk.c index e22b95646e09..0ebe5c51062b 100644 --- a/drivers/clk/ti/clk.c +++ b/drivers/clk/ti/clk.c @@ -103,7 +103,8 @@ int __init ti_clk_retry_init(struct device_node *node, struct clk_hw *hw, * @index: register index from the clock node * * Builds clock register address from device tree information. This - * is a struct of type clk_omap_reg. + * is a struct of type clk_omap_reg. Returns a pointer to the register + * address, or a pointer error value in failure. */ void __iomem *ti_clk_get_reg_addr(struct device_node *node, int index) { @@ -121,14 +122,14 @@ void __iomem *ti_clk_get_reg_addr(struct device_node *node, int index) if (i == CLK_MAX_MEMMAPS) { pr_err("clk-provider not found for %s!\n", node->name); - return NULL; + return ERR_PTR(-ENOENT); } reg->index = i; if (of_property_read_u32_index(node, "reg", index, &val)) { pr_err("%s must have reg[%d]!\n", node->name, index); - return NULL; + return ERR_PTR(-EINVAL); } reg->offset = val; |