Merge tag 'pinctrl-v5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[platform/kernel/linux-rpi.git] / drivers / firmware / xilinx / zynqmp.c

diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c
index fc01a36..15b1383 100644 (file)
--- 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>
@@ -1394,12 +1394,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);
        }