diff options
author | Maxime Ripard <maxime@cerno.tech> | 2022-05-03 11:53:42 +0200 |
---|---|---|
committer | Maxime Ripard <maxime@cerno.tech> | 2022-05-03 11:53:42 +0200 |
commit | b812f646bb818ca0e1806072eb7f0006f3a65dde (patch) | |
tree | 3ba2134dcefd8127f5ad286e0fe1135588fbd0b3 /net/mctp/device.c | |
parent | a5fc012e6ee75a899173398573e77207542f588a (diff) | |
parent | e954d2c94d007afe487044ecfa48f2518643df0e (diff) | |
download | linux-b812f646bb818ca0e1806072eb7f0006f3a65dde.tar.gz |
Merge drm/drm-next into drm-misc-next
Christian needs a backmerge to avoid a merge conflict for amdgpu.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'net/mctp/device.c')
-rw-r--r-- | net/mctp/device.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mctp/device.c b/net/mctp/device.c index f49be882e98e..99a3bda8852f 100644 --- a/net/mctp/device.c +++ b/net/mctp/device.c @@ -313,6 +313,7 @@ void mctp_dev_hold(struct mctp_dev *mdev) void mctp_dev_put(struct mctp_dev *mdev) { if (mdev && refcount_dec_and_test(&mdev->refs)) { + kfree(mdev->addrs); dev_put(mdev->dev); kfree_rcu(mdev, rcu); } @@ -441,7 +442,6 @@ static void mctp_unregister(struct net_device *dev) mctp_route_remove_dev(mdev); mctp_neigh_remove_dev(mdev); - kfree(mdev->addrs); mctp_dev_put(mdev); } |