diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-19 08:39:58 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-19 08:39:58 -0400 |
| commit | 14b6848bc0134b8838d374c423df3edda9b1490e (patch) | |
| tree | 724dc912efe84f432d33a798502811c5f5295774 /drivers/spi/omap_uwire.c | |
| parent | 05d9881bc4c6f172997b7a59e4a1a95910c4ebd7 (diff) | |
| parent | 4da3782151300237db3abe070f716922889252e0 (diff) | |
Merge branch 'omap-clks3' into devel
Conflicts:
arch/arm/mach-omap2/clock.c
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) | |||
| 506 | 506 | ||
| 507 | dev_set_drvdata(&pdev->dev, uwire); | 507 | dev_set_drvdata(&pdev->dev, uwire); |
| 508 | 508 | ||
| 509 | uwire->ck = clk_get(&pdev->dev, "armxor_ck"); | 509 | uwire->ck = clk_get(&pdev->dev, "fck"); |
| 510 | if (!uwire->ck || IS_ERR(uwire->ck)) { | 510 | if (IS_ERR(uwire->ck)) { |
| 511 | dev_dbg(&pdev->dev, "no mpu_xor_clk ?\n"); | 511 | status = PTR_ERR(uwire->ck); |
| 512 | dev_dbg(&pdev->dev, "no functional clock?\n"); | ||
| 512 | spi_master_put(master); | 513 | spi_master_put(master); |
| 513 | return -ENODEV; | 514 | return status; |
| 514 | } | 515 | } |
| 515 | clk_enable(uwire->ck); | 516 | clk_enable(uwire->ck); |
| 516 | 517 | ||