diff options
author | 2021-08-26 13:45:47 -0700 | |
---|---|---|
committer | 2021-08-26 17:57:57 -0700 | |
commit | 97c78d0af55fff206947a5f2b85b690b5acf28ce (patch) | |
tree | 9799b7594e0f4429919882a684d36ba649e0408b /drivers/gpu/drm/nouveau/nvif/object.c | |
parent | Merge branch 'LiteETH-driver' (diff) | |
parent | Merge tag 'nfsd-5.14-1' of git://linux-nfs.org/~bfields/linux (diff) | |
download | wireguard-linux-97c78d0af55fff206947a5f2b85b690b5acf28ce.tar.xz wireguard-linux-97c78d0af55fff206947a5f2b85b690b5acf28ce.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
drivers/net/wwan/mhi_wwan_mbim.c - drop the extra arg.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvif/object.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nvif/object.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvif/object.c b/drivers/gpu/drm/nouveau/nvif/object.c index 671a5c0199e0..dce1ecee2af5 100644 --- a/drivers/gpu/drm/nouveau/nvif/object.c +++ b/drivers/gpu/drm/nouveau/nvif/object.c @@ -44,8 +44,7 @@ nvif_object_ioctl(struct nvif_object *object, void *data, u32 size, void **hack) } else return -ENOSYS; - return client->driver->ioctl(client->object.priv, client->super, - data, size, hack); + return client->driver->ioctl(client->object.priv, data, size, hack); } void |