diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-01-20 23:16:11 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-01-20 23:16:11 +0300 |
| commit | 0fe2f273ab892bbba3f8d85e3f237bc0802e5709 (patch) | |
| tree | c0194aaa4d716cd49909176885bf498dd6de8cd4 /drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c | |
| parent | 7b8fc0103bb51d1d3e1fb5fd67958612e709f883 (diff) | |
| parent | 75439bc439e0f02903b48efce84876ca92da97bd (diff) | |
| download | linux-0fe2f273ab892bbba3f8d85e3f237bc0802e5709.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts:
drivers/net/can/dev.c
commit 03f16c5075b2 ("can: dev: can_restart: fix use after free bug")
commit 3e77f70e7345 ("can: dev: move driver related infrastructure into separate subdir")
Code move.
drivers/net/dsa/b53/b53_common.c
commit 8e4052c32d6b ("net: dsa: b53: fix an off by one in checking "vlan->vid"")
commit b7a9e0da2d1c ("net: switchdev: remove vid_begin -> vid_end range from VLAN objects")
Field rename.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c b/drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c index 685b70871324..b390029c69ec 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c +++ b/drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c @@ -76,7 +76,7 @@ wimmc37b_init_(const struct nv50_wimm_func *func, struct nouveau_drm *drm, int ret; ret = nv50_dmac_create(&drm->client.device, &disp->disp->object, - &oclass, 0, &args, sizeof(args), 0, + &oclass, 0, &args, sizeof(args), -1, &wndw->wimm); if (ret) { NV_ERROR(drm, "wimm%04x allocation failed: %d\n", oclass, ret); |