diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-03-30 23:43:03 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-03-30 23:43:03 +0200 |
| commit | 79548b7984e4c606c6caaad72a0864a83855ebc9 (patch) | |
| tree | 05e1be823acbae8bbcd155a706eb9e4f84eee047 /drivers/platform/x86/intel/vsec.c | |
| parent | smsc911x: remove superfluous variable init (diff) | |
| parent | Merge tag 'net-6.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
| download | linux-79548b7984e4c606c6caaad72a0864a83855ebc9.tar.xz linux-79548b7984e4c606c6caaad72a0864a83855ebc9.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts:
drivers/net/ethernet/mediatek/mtk_ppe.c
3fbe4d8c0e53 ("net: ethernet: mtk_eth_soc: ppe: add support for flow accounting")
924531326e2d ("net: ethernet: mtk_eth_soc: add missing ppe cache flush when deleting a flow")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/platform/x86/intel/vsec.c')
| -rw-r--r-- | drivers/platform/x86/intel/vsec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/platform/x86/intel/vsec.c b/drivers/platform/x86/intel/vsec.c index 13decf36c6de..2311c16cb975 100644 --- a/drivers/platform/x86/intel/vsec.c +++ b/drivers/platform/x86/intel/vsec.c @@ -154,6 +154,7 @@ int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent, ret = ida_alloc(intel_vsec_dev->ida, GFP_KERNEL); mutex_unlock(&vsec_ida_lock); if (ret < 0) { + kfree(intel_vsec_dev->resource); kfree(intel_vsec_dev); return ret; } |