diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-29 10:04:24 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-29 10:04:24 +0100 |
| commit | 42f1d2e06a25628ae4ceaadccc4fa67c7787e2b4 (patch) | |
| tree | 8aac83e399de7ad13748a59853a0feea9ed2c5cb /drivers/video/omap/rfbi.c | |
| parent | 9af5324a070e0b2dcb6e22c89e17424eba245fcc (diff) | |
| parent | 77bbca138c64cb80259732db6f70e1668123f2a7 (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci into devel
Diffstat (limited to 'drivers/video/omap/rfbi.c')
| -rw-r--r-- | drivers/video/omap/rfbi.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/video/omap/rfbi.c b/drivers/video/omap/rfbi.c index a13c8dcad2a..9332d6ca645 100644 --- a/drivers/video/omap/rfbi.c +++ b/drivers/video/omap/rfbi.c @@ -83,12 +83,14 @@ static inline u32 rfbi_read_reg(int idx) static int rfbi_get_clocks(void) { - if (IS_ERR((rfbi.dss_ick = clk_get(rfbi.fbdev->dev, "dss_ick")))) { - dev_err(rfbi.fbdev->dev, "can't get dss_ick\n"); + rfbi.dss_ick = clk_get(rfbi.fbdev->dev, "ick"); + if (IS_ERR(rfbi.dss_ick)) { + dev_err(rfbi.fbdev->dev, "can't get ick\n"); return PTR_ERR(rfbi.dss_ick); } - if (IS_ERR((rfbi.dss1_fck = clk_get(rfbi.fbdev->dev, "dss1_fck")))) { + rfbi.dss1_fck = clk_get(rfbi.fbdev->dev, "dss1_fck"); + if (IS_ERR(rfbi.dss1_fck)) { dev_err(rfbi.fbdev->dev, "can't get dss1_fck\n"); clk_put(rfbi.dss_ick); return PTR_ERR(rfbi.dss1_fck); |