]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
of: unittest: Remove bogus overlay mutex release from overlay_data_add()
authorGeert Uytterhoeven <geert+renesas@glider.be>
Mon, 27 Nov 2017 14:46:27 +0000 (15:46 +0100)
committerRob Herring <robh@kernel.org>
Wed, 6 Dec 2017 20:56:32 +0000 (14:56 -0600)
overlay_data_add() never takes the special overlay mutex, so it must not
be released in the error patch.

Presumably the call to of_overlay_mutex_unlock() is a relic from v1 of
the patch.

Fixes: f948d6d8b792bb90 ("of: overlay: avoid race condition between applying multiple overlays")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Frank Rowand <frank.rowand@sony.com>
Signed-off-by: Rob Herring <robh@kernel.org>
drivers/of/unittest.c

index e568b1e82501b832f4f92cb30810749d914855da..0f8052f1355c0c09ac99a43335ab67927cdac52b 100644 (file)
@@ -2165,7 +2165,6 @@ static int __init overlay_data_add(int onum)
        ret = of_overlay_apply(info->np_overlay, &info->overlay_id);
        if (ret < 0) {
                pr_err("of_overlay_apply() (ret=%d), %d\n", ret, onum);
-               of_overlay_mutex_unlock();
                goto out_free_np_overlay;
        }