summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikko Perttunen <mikko.perttunen@kapsi.fi>2014-09-26 14:23:25 +0300
committerJames Thomas <james.thomas@codethink.co.uk>2014-10-22 10:59:41 +0100
commit5ef94acc757fbd6e088862b2b779720206afbf30 (patch)
treeafd34ec7f997e91bd0e39258bea7a1b2669edaff
parentb26ea267a6002ed8cc3642594cef3ffcd83c11bc (diff)
downloadlinux-5ef94acc757fbd6e088862b2b779720206afbf30.tar.gz
FIXUP: DFLL clock source: check !soc before allocating
-rw-r--r--drivers/clk/tegra/clk-dfll.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/clk/tegra/clk-dfll.c b/drivers/clk/tegra/clk-dfll.c
index be14892af2e5..e71f4fb86d26 100644
--- a/drivers/clk/tegra/clk-dfll.c
+++ b/drivers/clk/tegra/clk-dfll.c
@@ -1600,16 +1600,17 @@ int tegra_dfll_register(struct platform_device *pdev,
struct tegra_dfll *td;
int ret;
+ if (!soc) {
+ dev_err(td->dev, "no tegra_dfll_soc_data provided\n");
+ return -EINVAL;
+ }
+
td = devm_kzalloc(&pdev->dev, sizeof(*td), GFP_KERNEL);
if (!td)
return -ENOMEM;
td->dev = &pdev->dev;
platform_set_drvdata(pdev, td);
- if (!soc) {
- dev_err(td->dev, "no tegra_dfll_soc_data provided\n");
- return -EINVAL;
- }
td->soc = soc;
td->vdd_reg = devm_regulator_get(td->dev, "vdd-cpu");