This is a note to let you know that I've just added the patch titled power: supply: ab8500: Fix an old bug to the 5.12-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: power-supply-ab8500-fix-an-old-bug.patch and it can be found in the queue-5.12 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From f1c74a6c07e76fcb31a4bcc1f437c4361a2674ce Mon Sep 17 00:00:00 2001 From: Linus Walleij <linus.walleij@xxxxxxxxxx> Date: Sun, 27 Jun 2021 01:47:49 +0200 Subject: power: supply: ab8500: Fix an old bug From: Linus Walleij <linus.walleij@xxxxxxxxxx> commit f1c74a6c07e76fcb31a4bcc1f437c4361a2674ce upstream. Trying to get the AB8500 charging driver working I ran into a bit of bitrot: we haven't used the driver for a while so errors in refactorings won't be noticed. This one is pretty self evident: use argument to the macro or we end up with a random pointer to something else. Cc: stable@xxxxxxxxxxxxxxx Cc: Krzysztof Kozlowski <krzk@xxxxxxxxxx> Cc: Marcus Cooper <codekipper@xxxxxxxxx> Fixes: 297d716f6260 ("power_supply: Change ownership from driver to core") Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx> Signed-off-by: Sebastian Reichel <sebastian.reichel@xxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- include/linux/mfd/abx500/ux500_chargalg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/include/linux/mfd/abx500/ux500_chargalg.h +++ b/include/linux/mfd/abx500/ux500_chargalg.h @@ -15,7 +15,7 @@ * - POWER_SUPPLY_TYPE_USB, * because only them store as drv_data pointer to struct ux500_charger. */ -#define psy_to_ux500_charger(x) power_supply_get_drvdata(psy) +#define psy_to_ux500_charger(x) power_supply_get_drvdata(x) /* Forward declaration */ struct ux500_charger; Patches currently in stable-queue which might be from linus.walleij@xxxxxxxxxx are queue-5.12/pinctrl-amd-add-device-hid-for-new-amd-gpio-controller.patch queue-5.12/power-supply-ab8500-fix-an-old-bug.patch queue-5.12/pinctrl-equilibrium-add-missing-module_device_table.patch queue-5.12/pinctrl-mcp23s08-fix-race-condition-in-irq-handler.patch