diff options
| author |   Dave Airlie <airlied@redhat.com> | 2018-07-10 10:46:42 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-07-10 10:48:30 +1000 |
| commit | 61a3a9d6c9c9a017decadb56669b66066612d728 (patch) | |
| tree | f090ba18187bcf946f100c8dc7b551806de1cc5b /drivers | |
| parent | Merge commit 'refs/for-upstream/mali-dp' of git://linux-arm.org/linux-ld into drm-next (diff) | |
| parent | drm/tilcdc: Defer probe if there are no connectors (diff) | |
| download | linux-dev-61a3a9d6c9c9a017decadb56669b66066612d728.tar.xz linux-dev-61a3a9d6c9c9a017decadb56669b66066612d728.zip | |
Merge tag 'tilcdc-4.19' of https://github.com/jsarha/linux into drm-next
tilcdc pull request for v4.19
Single fix to defer probing.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a10f5b43-7711-6b80-1bc3-0dfce65c628f@ti.com
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c index b8a5e4ed22e6..0fb300d41a09 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c @@ -378,7 +378,7 @@ static int tilcdc_init(struct drm_driver *ddrv, struct device *dev) if (!priv->external_connector && ((priv->num_encoders == 0) || (priv->num_connectors == 0))) { dev_err(dev, "no encoders/connectors found\n"); - ret = -ENXIO; + ret = -EPROBE_DEFER; goto init_failed; } |