diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-01-22 19:41:20 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-02-08 17:50:21 +0000 |
| commit | b1ad379632327c0722c5c92275c326971da3b948 (patch) | |
| tree | 8286b76b43189f4fd907b32340fb6c8afc77c1cf /drivers/spi/omap_uwire.c | |
| parent | cc51c9d444ae1532be6a600c65ac0d3d22472c53 (diff) | |
| download | lwn-b1ad379632327c0722c5c92275c326971da3b948.tar.gz lwn-b1ad379632327c0722c5c92275c326971da3b948.zip | |
[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 <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/spi/omap_uwire.c')
| -rw-r--r-- | drivers/spi/omap_uwire.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/spi/omap_uwire.c b/drivers/spi/omap_uwire.c index bab6ff061e91..394b616eafe3 100644 --- a/drivers/spi/omap_uwire.c +++ b/drivers/spi/omap_uwire.c @@ -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); |