Patch "platform/x86: intel_scu_ipc: Don't override scu in intel_scu_ipc_dev_simple_command()" has been added to the 5.15-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    platform/x86: intel_scu_ipc: Don't override scu in intel_scu_ipc_dev_simple_command()

to the 5.15-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     platform-x86-intel_scu_ipc-don-t-override-scu-in-int.patch
and it can be found in the queue-5.15 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 0e887f54ac2ee5e45bb0a64f674a76c422cecd75
Author: Stephen Boyd <swboyd@xxxxxxxxxxxx>
Date:   Wed Sep 13 14:27:21 2023 -0700

    platform/x86: intel_scu_ipc: Don't override scu in intel_scu_ipc_dev_simple_command()
    
    [ Upstream commit efce78584e583226e9a1f6cb2fb555d6ff47c3e7 ]
    
    Andy discovered this bug during patch review. The 'scu' argument to this
    function shouldn't be overridden by the function itself. It doesn't make
    any sense. Looking at the commit history, we see that commit
    f57fa18583f5 ("platform/x86: intel_scu_ipc: Introduce new SCU IPC API")
    removed the setting of the scu to ipcdev in other functions, but not
    this one. That was an oversight. Remove this line so that we stop
    overriding the scu instance that is used by this function.
    
    Reported-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
    Closes: https://lore.kernel.org/r/ZPjdZ3xNmBEBvNiS@xxxxxxxxxxxxxxxxxx
    Cc: Prashant Malani <pmalani@xxxxxxxxxxxx>
    Reviewed-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
    Reviewed-by: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx>
    Fixes: f57fa18583f5 ("platform/x86: intel_scu_ipc: Introduce new SCU IPC API")
    Signed-off-by: Stephen Boyd <swboyd@xxxxxxxxxxxx>
    Link: https://lore.kernel.org/r/20230913212723.3055315-4-swboyd@xxxxxxxxxxxx
    Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxxxxxx>
    Reviewed-by: Hans de Goede <hdegoede@xxxxxxxxxx>
    Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel_scu_ipc.c
index be97cfae4b0f3..dfe010f1ee084 100644
--- a/drivers/platform/x86/intel_scu_ipc.c
+++ b/drivers/platform/x86/intel_scu_ipc.c
@@ -444,7 +444,6 @@ int intel_scu_ipc_dev_simple_command(struct intel_scu_ipc_dev *scu, int cmd,
 		mutex_unlock(&ipclock);
 		return -ENODEV;
 	}
-	scu = ipcdev;
 	cmdval = sub << 12 | cmd;
 	ipc_command(scu, cmdval);
 	err = intel_scu_ipc_check_status(scu);