diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-08-15 09:16:58 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-08-15 09:16:58 +0300 |
| commit | 0c697fafc66830ca7d5dc19123a1d0641deaa1f6 (patch) | |
| tree | c56336719ca8de16f78ada78e606dffa471e47d5 /drivers/gpu/drm/nouveau/nouveau_connector.c | |
| parent | 09ef2378dc42339f3871584dc26d27da220277cb (diff) | |
| parent | ef954844c7ace62f773f4f23e28d2d915adc419f (diff) | |
| download | linux-0c697fafc66830ca7d5dc19123a1d0641deaa1f6.tar.xz | |
Backmerge tag 'v4.13-rc5' into drm-next
Linux 4.13-rc5
There's a really nasty nouveau collision, hopefully someone can take a look
once I pushed this out.
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_connector.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_connector.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c index 196eb668d30d..5137155bf3c0 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c @@ -1147,8 +1147,6 @@ nouveau_connector_aux_xfer(struct drm_dp_aux *obj, struct drm_dp_aux_msg *msg) return -ENODEV; if (WARN_ON(msg->size > 16)) return -E2BIG; - if (msg->size == 0) - return msg->size; ret = nvkm_i2c_aux_acquire(aux); if (ret) |