apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'clk-fixes' into clk-next

Browse Source
This commit is contained in:
Mike Turquette
2014-07-03 11:55:42 -07:00
parent fb2b3c9f68 c556bcddc7
commit cdae1730d0
12 changed files with 81 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/clk/clk-s2mps11.c
+2 -5
View File
@@ -219,16 +219,13 @@ static int s2mps11_clk_probe(struct platform_device *pdev)
goto err_reg;
}
s2mps11_clk->lookup = devm_kzalloc(&pdev->dev,
sizeof(struct clk_lookup), GFP_KERNEL);
s2mps11_clk->lookup = clkdev_alloc(s2mps11_clk->clk,
s2mps11_name(s2mps11_clk), NULL);
if (!s2mps11_clk->lookup) {
ret = -ENOMEM;
goto err_lup;
}
s2mps11_clk->lookup->con_id = s2mps11_name(s2mps11_clk);
s2mps11_clk->lookup->clk = s2mps11_clk->clk;
clkdev_add(s2mps11_clk->lookup);
}