diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-02-10 10:12:56 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-02-10 10:12:56 +1000 |
| commit | f320d3572344d34a6d8b516261416df0193602f6 (patch) | |
| tree | 1427043d37be6a594b247788640b8687f4171e02 /drivers | |
| parent | 79b33494af518d3f20d1b7365a0c717daff83ab6 (diff) | |
| parent | ef15d36154cc741d7ded4ae4fa0cf7987354e313 (diff) | |
| download | linux-f320d3572344d34a6d8b516261416df0193602f6.tar.bz2 | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/fsl-dcu/fsl_tcon.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/gpu/drm/fsl-dcu/fsl_tcon.c b/drivers/gpu/drm/fsl-dcu/fsl_tcon.c index 3194e544ee27..b3d70a63c5a3 100644 --- a/drivers/gpu/drm/fsl-dcu/fsl_tcon.c +++ b/drivers/gpu/drm/fsl-dcu/fsl_tcon.c @@ -72,10 +72,8 @@ struct fsl_tcon *fsl_tcon_init(struct device *dev) return NULL; tcon = devm_kzalloc(dev, sizeof(*tcon), GFP_KERNEL); - if (!tcon) { - ret = -ENOMEM; + if (!tcon) goto err_node_put; - } ret = fsl_tcon_init_regmap(dev, tcon, np); if (ret) { @@ -89,9 +87,13 @@ struct fsl_tcon *fsl_tcon_init(struct device *dev) goto err_node_put; } - of_node_put(np); - clk_prepare_enable(tcon->ipg_clk); + ret = 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"); return tcon; |