lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'mxc-pu-imxfb' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6 into devel

Browse Source
This commit is contained in:
Russell King
2008-12-17 20:04:45 +00:00
committed by Russell King
parent cd4348339c 80eee6bca4
commit c613bbba6f
49 changed files with 1368 additions and 1239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/common/sa1111.c
View File

@@ -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;
}