diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-06-24 13:15:10 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-06-24 13:15:10 +1000 |
| commit | 6559436d4a45fd42a0f40b8c3a963dd5be585b35 (patch) | |
| tree | ef92d3410061af5779aaf7a8197bb19763e92207 /drivers/gpu/drm/rcar-du/rcar_du_drv.c | |
| parent | 9da1030e3cf12228e8e27a289f3f1f16954afb1c (diff) | |
| parent | ccf49251f3fc8cef1c6e6cd9819b2d7f213d64c9 (diff) | |
| download | linux-6559436d4a45fd42a0f40b8c3a963dd5be585b35.tar.gz linux-6559436d4a45fd42a0f40b8c3a963dd5be585b35.tar.bz2 linux-6559436d4a45fd42a0f40b8c3a963dd5be585b35.zip | |
Merge branch 'drm/next/du' of git://linuxtv.org/pinchartl/media into drm-next
some rcar-du fixes.
* 'drm/next/du' of git://linuxtv.org/pinchartl/media:
drm: rcar-du: error message is not needed for EPROBE_DEFER
drm: rcar-du: error message is not needed for drm_vblank_init()
rcar-du: add/rename DEFR6 TCON bits
Diffstat (limited to 'drivers/gpu/drm/rcar-du/rcar_du_drv.c')
| -rw-r--r-- | drivers/gpu/drm/rcar-du/rcar_du_drv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c index d1c0512e4a9e..899ef7a2a7b4 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c @@ -336,15 +336,15 @@ static int rcar_du_probe(struct platform_device *pdev) * disabled for all CRTCs. */ ret = drm_vblank_init(ddev, (1 << rcdu->info->num_crtcs) - 1); - if (ret < 0) { - dev_err(&pdev->dev, "failed to initialize vblank\n"); + if (ret < 0) goto error; - } /* DRM/KMS objects */ ret = rcar_du_modeset_init(rcdu); if (ret < 0) { - dev_err(&pdev->dev, "failed to initialize DRM/KMS (%d)\n", ret); + if (ret != -EPROBE_DEFER) + dev_err(&pdev->dev, + "failed to initialize DRM/KMS (%d)\n", ret); goto error; } |