diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2021-03-25 11:46:10 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2021-03-25 11:46:10 -0700 |
commit | 5acac83bf2e42f51ab9fd315d657798754bf0bb8 (patch) | |
tree | 564be60664226649f00798cc3afb72d72d0ed24d /drivers/gpu/drm/vc4/vc4_gem.c | |
parent | Input: cyttsp - verbose error on soft reset (diff) | |
parent | Linux 5.12-rc4 (diff) | |
download | linux-dev-5acac83bf2e42f51ab9fd315d657798754bf0bb8.tar.xz linux-dev-5acac83bf2e42f51ab9fd315d657798754bf0bb8.zip |
Merge tag 'v5.12-rc4' into next
Sync up with the mainline to bring in newest APIs.
Diffstat (limited to 'drivers/gpu/drm/vc4/vc4_gem.c')
-rw-r--r-- | drivers/gpu/drm/vc4/vc4_gem.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_gem.c b/drivers/gpu/drm/vc4/vc4_gem.c index b641252939d8..445d3bab89e0 100644 --- a/drivers/gpu/drm/vc4/vc4_gem.c +++ b/drivers/gpu/drm/vc4/vc4_gem.c @@ -1026,7 +1026,6 @@ int vc4_queue_seqno_cb(struct drm_device *dev, void (*func)(struct vc4_seqno_cb *cb)) { struct vc4_dev *vc4 = to_vc4_dev(dev); - int ret = 0; unsigned long irqflags; cb->func = func; @@ -1041,7 +1040,7 @@ int vc4_queue_seqno_cb(struct drm_device *dev, } spin_unlock_irqrestore(&vc4->job_lock, irqflags); - return ret; + return 0; } /* Scheduled when any job has been completed, this walks the list of |