diff options
author | Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> | 2025-01-20 15:22:06 +0300 |
---|---|---|
committer | Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> | 2025-01-21 15:00:38 +0300 |
commit | 0da9a3f9ac8ada83fa79579455871ec59f11db72 (patch) | |
tree | 48a22c56221b8c9b3639cf132330117baf2c5181 /drivers/platform/x86/mlx-platform.c | |
parent | 3ef4ea516c2f8a2f1ff8ca59b156fb2e4472c2a4 (diff) | |
parent | 59616a91e5e74833b2008b56c66879857c616006 (diff) | |
download | linux-0da9a3f9ac8ada83fa79579455871ec59f11db72.tar.xz |
Merge branch 'fixes' into 'for-next'
Merged the 'fixes' branch into the 'for-next' branch to resolve
a conflict in alienware-wmi zone teardown code.
Diffstat (limited to 'drivers/platform/x86/mlx-platform.c')
-rw-r--r-- | drivers/platform/x86/mlx-platform.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/platform/x86/mlx-platform.c b/drivers/platform/x86/mlx-platform.c index 671021cd1f59..9c7f30a47f1f 100644 --- a/drivers/platform/x86/mlx-platform.c +++ b/drivers/platform/x86/mlx-platform.c @@ -6237,6 +6237,7 @@ fail_pci_set_dma_mask: fail_pci_request_regions: pci_disable_device(pci_dev); fail_pci_enable_device: + pci_dev_put(pci_dev); return err; } @@ -6247,6 +6248,7 @@ mlxplat_pci_fpga_device_exit(struct pci_dev *pci_bridge, iounmap(pci_bridge_addr); pci_release_regions(pci_bridge); pci_disable_device(pci_bridge); + pci_dev_put(pci_bridge); } static int |