diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-07-09 20:46:42 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-07-09 20:48:30 -0400 |
| commit | 61a3a9d6c9c9a017decadb56669b66066612d728 (patch) | |
| tree | f090ba18187bcf946f100c8dc7b551806de1cc5b | |
| parent | 4da1d4c751c9b1b713c13043bad7c4d27cd1418c (diff) | |
| parent | a132b5a5081ca106193a02e0835e01db7c4055ec (diff) | |
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
| -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) | |||
| 378 | if (!priv->external_connector && | 378 | if (!priv->external_connector && |
| 379 | ((priv->num_encoders == 0) || (priv->num_connectors == 0))) { | 379 | ((priv->num_encoders == 0) || (priv->num_connectors == 0))) { |
| 380 | dev_err(dev, "no encoders/connectors found\n"); | 380 | dev_err(dev, "no encoders/connectors found\n"); |
| 381 | ret = -ENXIO; | 381 | ret = -EPROBE_DEFER; |
| 382 | goto init_failed; | 382 | goto init_failed; |
| 383 | } | 383 | } |
| 384 | 384 | ||