Skip to content

Commit 49deb28

Browse files
committed
Merge tag 'pinctrl-v6.8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull pin control fixes from Linus Walleij: - Fix the PM suspend callback in the STM32 ST32MP257 driver to properly support suspend - Drop an extraneous reference put in the debugfs code, this was confusing the reference counts and causing unsolicited calls to __free() * tag 'pinctrl-v6.8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: pinctrl: don't put the reference to GPIO device in pinctrl_pins_show() pinctrl: stm32: fix PM support for stm32mp257
2 parents 7a4f31c + f6443e0 commit 49deb28

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

drivers/pinctrl/core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1644,7 +1644,7 @@ static int pinctrl_pins_show(struct seq_file *s, void *what)
16441644
const struct pinctrl_ops *ops = pctldev->desc->pctlops;
16451645
unsigned int i, pin;
16461646
#ifdef CONFIG_GPIOLIB
1647-
struct gpio_device *gdev __free(gpio_device_put) = NULL;
1647+
struct gpio_device *gdev = NULL;
16481648
struct pinctrl_gpio_range *range;
16491649
int gpio_num;
16501650
#endif

drivers/pinctrl/stm32/pinctrl-stm32mp257.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2562,7 +2562,7 @@ static const struct of_device_id stm32mp257_pctrl_match[] = {
25622562
};
25632563

25642564
static const struct dev_pm_ops stm32_pinctrl_dev_pm_ops = {
2565-
SET_LATE_SYSTEM_SLEEP_PM_OPS(NULL, stm32_pinctrl_resume)
2565+
SET_LATE_SYSTEM_SLEEP_PM_OPS(stm32_pinctrl_suspend, stm32_pinctrl_resume)
25662566
};
25672567

25682568
static struct platform_driver stm32mp257_pinctrl_driver = {

0 commit comments

Comments
 (0)