aboutsummaryrefslogtreecommitdiff
path: root/drivers/clk/clk-gate.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2015-05-22 17:20:05 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2015-05-22 17:20:05 +1000
commit68fddca6807db21c210e5facb69749cb8ac5f1fd (patch)
tree6954d8a56a32bd85dd035f122800d9be22baa1ab /drivers/clk/clk-gate.c
parentffd0824dd6f8acbec931097e5f9b74bab5fa09c9 (diff)
parent5343325ff3dd299f459fa9dacbd95dca5c9bf215 (diff)
Merge remote-tracking branch 'clk/clk-next'
Diffstat (limited to 'drivers/clk/clk-gate.c')
-rw-r--r--drivers/clk/clk-gate.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/clk/clk-gate.c b/drivers/clk/clk-gate.c
index 3f0e4200cb5d..551dd0672794 100644
--- a/drivers/clk/clk-gate.c
+++ b/drivers/clk/clk-gate.c
@@ -135,11 +135,9 @@ struct clk *clk_register_gate(struct device *dev, const char *name,
}
/* allocate the gate */
- gate = kzalloc(sizeof(struct clk_gate), GFP_KERNEL);
- if (!gate) {
- pr_err("%s: could not allocate gated clk\n", __func__);
+ gate = kzalloc(sizeof(*gate), GFP_KERNEL);
+ if (!gate)
return ERR_PTR(-ENOMEM);
- }
init.name = name;
init.ops = &clk_gate_ops;