diff options
author | David S. Miller <davem@davemloft.net> | 2020-03-13 05:29:30 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2020-03-13 06:34:48 +0100 |
commit | 1d343579312311aa9875b34d5a921f5e2ec69f0a (patch) | |
tree | 64b636b5557d92f5266187f035dac34862db86d5 /drivers/gpu/drm/i915/gvt/dmabuf.c | |
parent | inet: Use fallthrough; (diff) | |
parent | Merge tag 'drm-fixes-2020-03-13' of git://anongit.freedesktop.org/drm/drm (diff) | |
download | linux-1d343579312311aa9875b34d5a921f5e2ec69f0a.tar.xz linux-1d343579312311aa9875b34d5a921f5e2ec69f0a.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Minor overlapping changes, nothing serious.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/gpu/drm/i915/gvt/dmabuf.c')
-rw-r--r-- | drivers/gpu/drm/i915/gvt/dmabuf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gvt/dmabuf.c b/drivers/gpu/drm/i915/gvt/dmabuf.c index 2477a1e5a166..ae139f0877ae 100644 --- a/drivers/gpu/drm/i915/gvt/dmabuf.c +++ b/drivers/gpu/drm/i915/gvt/dmabuf.c @@ -151,12 +151,12 @@ static void dmabuf_gem_object_free(struct kref *kref) dmabuf_obj = container_of(pos, struct intel_vgpu_dmabuf_obj, list); if (dmabuf_obj == obj) { + list_del(pos); intel_gvt_hypervisor_put_vfio_device(vgpu); idr_remove(&vgpu->object_idr, dmabuf_obj->dmabuf_id); kfree(dmabuf_obj->info); kfree(dmabuf_obj); - list_del(pos); break; } } |