mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 04:01:48 -04:00
[ARM] omap: spi: arrange for omap_uwire to use connection ID
... which now means no driver requests the "armxor_ck" clock directly. Also, fix the error handling for clk_get(), ensuring that we propagate the error returned from clk_get(). Signed-off-by: Russell King <[email protected]>
This commit is contained in:
parent
cc51c9d444
commit
b1ad379632
2 changed files with 6 additions and 4 deletions
|
|
@ -506,11 +506,12 @@ static int __init uwire_probe(struct platform_device *pdev)
|
|||
|
||||
dev_set_drvdata(&pdev->dev, uwire);
|
||||
|
||||
uwire->ck = clk_get(&pdev->dev, "armxor_ck");
|
||||
if (!uwire->ck || IS_ERR(uwire->ck)) {
|
||||
dev_dbg(&pdev->dev, "no mpu_xor_clk ?\n");
|
||||
uwire->ck = clk_get(&pdev->dev, "fck");
|
||||
if (IS_ERR(uwire->ck)) {
|
||||
status = PTR_ERR(uwire->ck);
|
||||
dev_dbg(&pdev->dev, "no functional clock?\n");
|
||||
spi_master_put(master);
|
||||
return -ENODEV;
|
||||
return status;
|
||||
}
|
||||
clk_enable(uwire->ck);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue