diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-12-04 11:53:43 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-12-04 11:53:50 +1000 |
| commit | de9b485d1dc993f1fb579b5d15a8176284627f4a (patch) | |
| tree | fec276be5bbf9beb880e50ab51dac13929a034a6 /drivers/gpu/drm/nouveau/nouveau_bo.c | |
| parent | 5353219ffdff68f861684a642388d6e926547698 (diff) | |
| parent | fd4e788e971ce763e50762d7b1a0048992949dd0 (diff) | |
Merge tag 'drm-misc-fixes-2020-12-03' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
One bridge fix for OMAP, one for a race condition in a panel, two for
uninitialized variables in rockchip and nouveau, and two fixes for mxsfb
to fix a regression with modifiers and a fix for a fence synchronization
issue.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20201203125943.h2ft2xoywunt5orl@gilmour
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_bo.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index 56b335a55966..7daa12eec01b 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -1214,8 +1214,8 @@ retry: } reg->bus.offset = handle; - ret = 0; } + ret = 0; break; default: ret = -EINVAL; |