diff options
| author | Arnd Bergmann | 2021-04-13 10:59:45 +0200 |
|---|---|---|
| committer | Arnd Bergmann | 2021-04-13 10:59:45 +0200 |
| commit | 5418db1f6ee3d876945f280d19a23fa3bcb8d8c5 (patch) | |
| tree | a7e897e39618706be2e27fd12cce3a3d3b8beb69 /drivers/firmware | |
| parent | 30be8446db39be8dc52fc8cd2cb601d3d6319e9d (diff) | |
| parent | 79bfe480a0a0b259ab9fddcd2fe52c03542b1196 (diff) | |
Merge tag 'zynqmp-soc-for-v5.13' of https://github.com/Xilinx/linux-xlnx into arm/drivers
arm64: soc: ZynqMP SoC changes for v5.13
- Fix firmware removal path
- Cleanup eemi doc and *ops()
* tag 'zynqmp-soc-for-v5.13' of https://github.com/Xilinx/linux-xlnx:
firmware: xilinx: Remove zynqmp_pm_get_eemi_ops() in IS_REACHABLE(CONFIG_ZYNQMP_FIRMWARE)
firmware: xilinx: Fix dereferencing freed memory
Link: https://lore.kernel.org/r/a44f8e9f-cea7-57ef-c3bc-10f5f5e064fc@monstr.eu
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/xilinx/zynqmp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c index 7eb9958662dd..83082e2f2e44 100644 --- a/drivers/firmware/xilinx/zynqmp.c +++ b/drivers/firmware/xilinx/zynqmp.c @@ -2,7 +2,7 @@ /* * Xilinx Zynq MPSoC Firmware layer * - * Copyright (C) 2014-2020 Xilinx, Inc. + * Copyright (C) 2014-2021 Xilinx, Inc. * * Michal Simek <michal.simek@xilinx.com> * Davorin Mista <davorin.mista@aggios.com> @@ -1280,12 +1280,13 @@ static int zynqmp_firmware_probe(struct platform_device *pdev) static int zynqmp_firmware_remove(struct platform_device *pdev) { struct pm_api_feature_data *feature_data; + struct hlist_node *tmp; int i; mfd_remove_devices(&pdev->dev); zynqmp_pm_api_debugfs_exit(); - hash_for_each(pm_api_features_map, i, feature_data, hentry) { + hash_for_each_safe(pm_api_features_map, i, tmp, feature_data, hentry) { hash_del(&feature_data->hentry); kfree(feature_data); } |