Commit 49deb280 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 7a4f31c7 f6443e01
...@@ -1644,7 +1644,7 @@ static int pinctrl_pins_show(struct seq_file *s, void *what) ...@@ -1644,7 +1644,7 @@ static int pinctrl_pins_show(struct seq_file *s, void *what)
const struct pinctrl_ops *ops = pctldev->desc->pctlops; const struct pinctrl_ops *ops = pctldev->desc->pctlops;
unsigned int i, pin; unsigned int i, pin;
#ifdef CONFIG_GPIOLIB #ifdef CONFIG_GPIOLIB
struct gpio_device *gdev __free(gpio_device_put) = NULL; struct gpio_device *gdev = NULL;
struct pinctrl_gpio_range *range; struct pinctrl_gpio_range *range;
int gpio_num; int gpio_num;
#endif #endif
......
...@@ -2562,7 +2562,7 @@ static const struct of_device_id stm32mp257_pctrl_match[] = { ...@@ -2562,7 +2562,7 @@ static const struct of_device_id stm32mp257_pctrl_match[] = {
}; };
static const struct dev_pm_ops stm32_pinctrl_dev_pm_ops = { static const struct dev_pm_ops stm32_pinctrl_dev_pm_ops = {
SET_LATE_SYSTEM_SLEEP_PM_OPS(NULL, stm32_pinctrl_resume) SET_LATE_SYSTEM_SLEEP_PM_OPS(stm32_pinctrl_suspend, stm32_pinctrl_resume)
}; };
static struct platform_driver stm32mp257_pinctrl_driver = { static struct platform_driver stm32mp257_pinctrl_driver = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment