]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
of: unittest: Fix overlay type in apply/revert check
authorGeert Uytterhoeven <geert+renesas@glider.be>
Fri, 28 Jul 2023 08:50:29 +0000 (10:50 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 13 Sep 2023 07:48:19 +0000 (09:48 +0200)
[ Upstream commit 6becf8f845ae1f0b1cfed395bbeccbd23654162d ]

The removal check in of_unittest_apply_revert_overlay_check()
always uses the platform device overlay type, while it should use the
actual overlay type, as passed as a parameter to the function.

This has no impact on any current test, as all tests calling
of_unittest_apply_revert_overlay_check() use the platform device overlay
type.

Fixes: d5e75500ca401d31 ("of: unitest: Add I2C overlay unit tests.")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/ba0234c41ba808f10112094f88792beeb6dbaedf.1690533838.git.geert+renesas@glider.be
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/of/unittest.c

index be41eb246b6b284b58dd86bf148d2299e31e2828..03a1de841d3b761cbc1c3198ad9712d0230111d8 100644 (file)
@@ -2210,7 +2210,7 @@ static int __init of_unittest_apply_revert_overlay_check(int overlay_nr,
        of_unittest_untrack_overlay(save_ovcs_id);
 
        /* unittest device must be again in before state */
-       if (of_unittest_device_exists(unittest_nr, PDEV_OVERLAY) != before) {
+       if (of_unittest_device_exists(unittest_nr, ovtype) != before) {
                unittest(0, "%s with device @\"%s\" %s\n",
                                overlay_name_from_nr(overlay_nr),
                                unittest_path(unittest_nr, ovtype),