diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-17 13:07:48 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-17 13:07:48 +0100 |
| commit | 1f3f424a6bee9de4d839be9951f4296333fac014 (patch) | |
| tree | 95de90dfdb4a9f64fe470709b82176243537c952 /arch/arm/common | |
| parent | c8cae544bba6aee0f5cb0756dbab1a71d2c68737 (diff) | |
| parent | 1bda71282ded6a2e09a2db7c8884542fb46bfd4f (diff) | |
Merge branch 'linus' into cpus4096
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 47ccec95f3e..ef12794c3c6 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) return -ENOMEM; sachip->clk = clk_get(me, "SA1111_CLK"); - if (!sachip->clk) { + if (IS_ERR(sachip->clk)) { ret = PTR_ERR(sachip->clk); goto err_free; } |