diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-09-21 06:28:25 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-09-21 06:28:25 +1000 |
| commit | 52f13a02b7d5f26feb69bf955bef10fbfaafbd7c (patch) | |
| tree | 512fcb6f6a79ff37d10cdc5cab0c9341128a7ba5 /drivers/gpu/drm/fsl-dcu/fsl_tcon.c | |
| parent | 26e34d2d8ba7aca0fe86e5362ce5811749df77b2 (diff) | |
| parent | e0dc7c837dd0f514abce47101c04ce0ce243188e (diff) | |
Merge branch 'for-next' of http://git.agner.ch/git/linux-drm-fsl-dcu into drm-next
fsl-dcu fixes.
* 'for-next' of http://git.agner.ch/git/linux-drm-fsl-dcu:
drm/fsl-dcu: disable clock on error path
drm/fsl-dcu: use PTR_ERR_OR_ZERO() to simplify the code
drm/fsl-dcu: fix endian issue when using clk_register_divider
Diffstat (limited to 'drivers/gpu/drm/fsl-dcu/fsl_tcon.c')
| -rw-r--r-- | drivers/gpu/drm/fsl-dcu/fsl_tcon.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/fsl-dcu/fsl_tcon.c b/drivers/gpu/drm/fsl-dcu/fsl_tcon.c index bca09ea24632..3194e544ee27 100644 --- a/drivers/gpu/drm/fsl-dcu/fsl_tcon.c +++ b/drivers/gpu/drm/fsl-dcu/fsl_tcon.c @@ -57,10 +57,7 @@ static int fsl_tcon_init_regmap(struct device *dev, tcon->regs = devm_regmap_init_mmio(dev, regs, &fsl_tcon_regmap_config); - if (IS_ERR(tcon->regs)) - return PTR_ERR(tcon->regs); - - return 0; + return PTR_ERR_OR_ZERO(tcon->regs); } struct fsl_tcon *fsl_tcon_init(struct device *dev) |