diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-17 15:04:45 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-17 15:04:45 -0500 |
| commit | c613bbba6f39c8804f1f26e96fb68a117cc9e282 (patch) | |
| tree | 85fbc24f26b61ce4e7a908d18952e3abc1f5cd10 /arch/arm/common | |
| parent | cd4348339c21f4a15c01f3f120e92b3224a0a7da (diff) | |
| parent | 80eee6bca4069c48247005aa07cb5e8e86042aa3 (diff) | |
Merge branch 'mxc-pu-imxfb' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6 into devel
Diffstat (limited to 'arch/arm/common')
| -rw-r--r-- | arch/arm/common/sa1111.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c index 47ccec95f3e8..ef12794c3c68 100644 --- a/arch/arm/common/sa1111.c +++ b/arch/arm/common/sa1111.c | |||
| @@ -630,7 +630,7 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq) | |||
| 630 | return -ENOMEM; | 630 | return -ENOMEM; |
| 631 | 631 | ||
| 632 | sachip->clk = clk_get(me, "SA1111_CLK"); | 632 | sachip->clk = clk_get(me, "SA1111_CLK"); |
| 633 | if (!sachip->clk) { | 633 | if (IS_ERR(sachip->clk)) { |
| 634 | ret = PTR_ERR(sachip->clk); | 634 | ret = PTR_ERR(sachip->clk); |
| 635 | goto err_free; | 635 | goto err_free; |
| 636 | } | 636 | } |