diff options
| author | Emanuele Ghidoli <emanuele.ghidoli@toradex.com> | 2023-08-28 18:34:49 +0200 |
|---|---|---|
| committer | Emanuele Ghidoli <emanuele.ghidoli@toradex.com> | 2023-08-28 18:34:49 +0200 |
| commit | bc1f5a6f2061997b65ff977f6b3523418ec7a0d8 (patch) | |
| tree | 6b1e20f7bded4f9e47639fe037a60fc9a113b6b0 /drivers/pinctrl/pinctrl-at91-pio4.c | |
| parent | 3d5da868db16a913b37e08f3cfe3a086d44f46fa (diff) | |
| parent | abddfcf701a5427cb1bddeaa130bceb72b160aa5 (diff) | |
Merge tag 'v5.15.99' into 5.15-2.2.x-imx
This is the 5.15.99 stable release
Conflicts:
arch/arm/mach-imx/mmdc.c
drivers/tty/serial/fsl_lpuart.c
sound/soc/fsl/fsl_sai.c
sound/soc/fsl/fsl_sai.h
Signed-off-by: Emanuele Ghidoli <emanuele.ghidoli@toradex.com>
Diffstat (limited to 'drivers/pinctrl/pinctrl-at91-pio4.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl-at91-pio4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c index 03c32b2c5d30..c86fcdfaf825 100644 --- a/drivers/pinctrl/pinctrl-at91-pio4.c +++ b/drivers/pinctrl/pinctrl-at91-pio4.c @@ -1126,8 +1126,8 @@ static int atmel_pinctrl_probe(struct platform_device *pdev) pin_desc[i].number = i; /* Pin naming convention: P(bank_name)(bank_pin_number). */ - pin_desc[i].name = kasprintf(GFP_KERNEL, "P%c%d", - bank + 'A', line); + pin_desc[i].name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "P%c%d", + bank + 'A', line); group->name = group_names[i] = pin_desc[i].name; group->pin = pin_desc[i].number; |