diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-11-26 03:26:29 -0500 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-11-26 03:26:29 -0500 |
| commit | 474ff6b8a79093aea966b6246d5b8000de124da9 (patch) | |
| tree | c73caeaeef6d800ca8795687294ed2cbd74607db /drivers/video/omap2/dss | |
| parent | 9b76c9cdece2b14a23bfddd765f6dac1dd4d0120 (diff) | |
| parent | 8ad9375f8b7c709b89f7de4de413bb2644ba3c24 (diff) | |
Merge tag 'omapdss-for-3.7-rc' of git://gitorious.org/linux-omap-dss2/linux
omapdss fixes for 3.7-rc
Conflicts:
drivers/video/omap2/dss/dss.c
Diffstat (limited to 'drivers/video/omap2/dss')
| -rw-r--r-- | drivers/video/omap2/dss/dss.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c index df3d89a8c8a9..6ca69d55cf57 100644 --- a/drivers/video/omap2/dss/dss.c +++ b/drivers/video/omap2/dss/dss.c | |||
| @@ -753,11 +753,15 @@ static int dss_get_clocks(void) | |||
| 753 | 753 | ||
| 754 | dss.dss_clk = clk; | 754 | dss.dss_clk = clk; |
| 755 | 755 | ||
| 756 | clk = clk_get(NULL, dss.feat->clk_name); | 756 | if (dss.feat->clk_name) { |
| 757 | if (IS_ERR(clk)) { | 757 | clk = clk_get(NULL, dss.feat->clk_name); |
| 758 | DSSERR("Failed to get %s\n", dss.feat->clk_name); | 758 | if (IS_ERR(clk)) { |
| 759 | r = PTR_ERR(clk); | 759 | DSSERR("Failed to get %s\n", dss.feat->clk_name); |
| 760 | goto err; | 760 | r = PTR_ERR(clk); |
| 761 | goto err; | ||
| 762 | } | ||
| 763 | } else { | ||
| 764 | clk = NULL; | ||
| 761 | } | 765 | } |
| 762 | 766 | ||
| 763 | dss.dpll4_m4_ck = clk; | 767 | dss.dpll4_m4_ck = clk; |