Commit f320d357 authored by Dave Airlie's avatar Dave Airlie

Merge tag 'drm-fsl-dcu-for-v4.11' of http://git.agner.ch/git/linux-drm-fsl-dcu into drm-next

two minor fixes.

* tag 'drm-fsl-dcu-for-v4.11' of http://git.agner.ch/git/linux-drm-fsl-dcu:
  drm/fsl-dcu: check for clk_prepare_enable() error
  drm/fsl-dcu: remove unneeded 'ret' assignment
parents 79b33494 ef15d361
...@@ -72,10 +72,8 @@ struct fsl_tcon *fsl_tcon_init(struct device *dev) ...@@ -72,10 +72,8 @@ struct fsl_tcon *fsl_tcon_init(struct device *dev)
return NULL; return NULL;
tcon = devm_kzalloc(dev, sizeof(*tcon), GFP_KERNEL); tcon = devm_kzalloc(dev, sizeof(*tcon), GFP_KERNEL);
if (!tcon) { if (!tcon)
ret = -ENOMEM;
goto err_node_put; goto err_node_put;
}
ret = fsl_tcon_init_regmap(dev, tcon, np); ret = fsl_tcon_init_regmap(dev, tcon, np);
if (ret) { if (ret) {
...@@ -89,9 +87,13 @@ struct fsl_tcon *fsl_tcon_init(struct device *dev) ...@@ -89,9 +87,13 @@ struct fsl_tcon *fsl_tcon_init(struct device *dev)
goto err_node_put; goto err_node_put;
} }
of_node_put(np); ret = clk_prepare_enable(tcon->ipg_clk);
clk_prepare_enable(tcon->ipg_clk); if (ret) {
dev_err(dev, "Couldn't enable the TCON clock\n");
goto err_node_put;
}
of_node_put(np);
dev_info(dev, "Using TCON in bypass mode\n"); dev_info(dev, "Using TCON in bypass mode\n");
return tcon; return tcon;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment