Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 200451
b: refs/heads/master
c: bc092a3
h: refs/heads/master
i:
  200449: 8a9b311
  200447: 5477c92
v: v3
  • Loading branch information
Tomi Valkeinen committed Jun 15, 2010
1 parent 3a36c15 commit 6c666e2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 256a8042830e6ac1c3dd2e912e3c45769dd709cc
refs/heads/master: bc092a303a1b980c67324920471e23354b0721cd
5 changes: 3 additions & 2 deletions trunk/drivers/video/omap/rfbi.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include <linux/interrupt.h>
#include <linux/clk.h>
#include <linux/io.h>
#include <linux/platform_device.h>

#include "omapfb.h"
#include "dispc.h"
Expand Down Expand Up @@ -83,13 +84,13 @@ static inline u32 rfbi_read_reg(int idx)

static int rfbi_get_clocks(void)
{
rfbi.dss_ick = clk_get(&dispc.fbdev->dssdev->dev, "ick");
rfbi.dss_ick = clk_get(&rfbi.fbdev->dssdev->dev, "ick");
if (IS_ERR(rfbi.dss_ick)) {
dev_err(rfbi.fbdev->dev, "can't get ick\n");
return PTR_ERR(rfbi.dss_ick);
}

rfbi.dss1_fck = clk_get(&dispc.fbdev->dssdev->dev, "dss1_fck");
rfbi.dss1_fck = clk_get(&rfbi.fbdev->dssdev->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);
Expand Down

0 comments on commit 6c666e2

Please sign in to comment.