diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-29 04:40:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-29 04:40:34 -0400 |
| commit | 13223cb02ccfa375f2d683d08d30db5b72264f1e (patch) | |
| tree | d3fc7d803d22bbfe03b96cf0ba38041d42c8a1c2 /drivers/spi/omap_uwire.c | |
| parent | 1383bdb98c01bbd28d72336d1bf614ce79114d29 (diff) | |
| parent | 07d43ba98621f08e252a48c96b258b4d572b0257 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
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 60b5381c65c4..fe8b9ac0ccef 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 | ||