diff options
| author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2012-11-21 14:48:51 -0500 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-11-22 10:23:12 -0500 |
| commit | 8ad9375f8b7c709b89f7de4de413bb2644ba3c24 (patch) | |
| tree | 12d22fb991733f9ba19f961062c9ff7e8a2db09a /drivers/video | |
| parent | c415187b689842e8bb85135c070c822c2505f805 (diff) | |
OMAPDSS: do not fail if dpll4_m4_ck is missing
Do not fail if dpll4_m4_ck is missing. The clock is not there on omap24xx,
so this should not be a hard error.
The patch retains the functionality before the commit 185bae10 (OMAPDSS:
DSS: Cleanup cpu_is_xxxx checks).
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
| -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 0bb7406bdbb8..5f6eea801b06 100644 --- a/drivers/video/omap2/dss/dss.c +++ b/drivers/video/omap2/dss/dss.c | |||
| @@ -697,11 +697,15 @@ static int dss_get_clocks(void) | |||
| 697 | 697 | ||
| 698 | dss.dss_clk = clk; | 698 | dss.dss_clk = clk; |
| 699 | 699 | ||
| 700 | clk = clk_get(NULL, dss.feat->clk_name); | 700 | if (dss.feat->clk_name) { |
| 701 | if (IS_ERR(clk)) { | 701 | clk = clk_get(NULL, dss.feat->clk_name); |
| 702 | DSSERR("Failed to get %s\n", dss.feat->clk_name); | 702 | if (IS_ERR(clk)) { |
| 703 | r = PTR_ERR(clk); | 703 | DSSERR("Failed to get %s\n", dss.feat->clk_name); |
| 704 | goto err; | 704 | r = PTR_ERR(clk); |
| 705 | goto err; | ||
| 706 | } | ||
| 707 | } else { | ||
| 708 | clk = NULL; | ||
| 705 | } | 709 | } |
| 706 | 710 | ||
| 707 | dss.dpll4_m4_ck = clk; | 711 | dss.dpll4_m4_ck = clk; |