diff options
| author | David S. Miller <davem@davemloft.net> | 2018-01-19 22:59:33 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-19 22:59:33 -0500 |
| commit | 8565d26bcb2ff6df646e946d2913fcf706d46b66 (patch) | |
| tree | 21ffaccc3cbac5e558d51c20cfbecbfec86a02c4 /drivers/gpu/drm/nouveau/nvkm/subdev/bar/base.c | |
| parent | 85831e56a1d0c75a1560e61acbb8591e9f11c6b7 (diff) | |
| parent | ec835f8104a21f4d4eeb9d316ee71d2b4a7f00de (diff) | |
| download | op-kernel-dev-8565d26bcb2ff6df646e946d2913fcf706d46b66.zip op-kernel-dev-8565d26bcb2ff6df646e946d2913fcf706d46b66.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The BPF verifier conflict was some minor contextual issue.
The TUN conflict was less trivial. Cong Wang fixed a memory leak of
tfile->tx_array in 'net'. This is an skb_array. But meanwhile in
net-next tun changed tfile->tx_arry into tfile->tx_ring which is a
ptr_ring.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/bar/base.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/bar/base.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/base.c index 9646ade..243f0a5 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/base.c @@ -73,7 +73,8 @@ static int nvkm_bar_fini(struct nvkm_subdev *subdev, bool suspend) { struct nvkm_bar *bar = nvkm_bar(subdev); - bar->func->bar1.fini(bar); + if (bar->func->bar1.fini) + bar->func->bar1.fini(bar); return 0; } |
