diff options
| author | Takashi Iwai <tiwai@suse.de> | 2023-10-31 09:01:25 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-10-31 09:01:25 +0100 |
| commit | 2dc15ff73b6a7b47db0e848498cb5b0479e781c6 (patch) | |
| tree | d93457787d3349dadcbbf7691650ebdb1d0cd883 /drivers/pinctrl/nuvoton/pinctrl-wpcm450.c | |
| parent | Merge branch 'for-next' into for-linus (diff) | |
| parent | ASoC: Merge up workaround for CODECs that play noise on stopped stream (diff) | |
| download | linux-2dc15ff73b6a7b47db0e848498cb5b0479e781c6.tar.xz linux-2dc15ff73b6a7b47db0e848498cb5b0479e781c6.zip | |
Merge tag 'asoc-v6.7-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v6.7
More updates for v6,7 following the early merge request:
- Fixes for handling of component name prefixing when name prefixes
are used by the machine driver.
- Fixes for noise when stopping some Sounwire CODECs.
- Support for AMD ACP 6.3 and 7.0, Awinc AW88399, more Intel
platforms and more Qualcomm SC7180 platforms.
Diffstat (limited to 'drivers/pinctrl/nuvoton/pinctrl-wpcm450.c')
| -rw-r--r-- | drivers/pinctrl/nuvoton/pinctrl-wpcm450.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pinctrl/nuvoton/pinctrl-wpcm450.c b/drivers/pinctrl/nuvoton/pinctrl-wpcm450.c index 2d1c1652cfd9..8a9961ac8712 100644 --- a/drivers/pinctrl/nuvoton/pinctrl-wpcm450.c +++ b/drivers/pinctrl/nuvoton/pinctrl-wpcm450.c @@ -1062,13 +1062,13 @@ static int wpcm450_gpio_register(struct platform_device *pdev, if (ret < 0) return ret; - gpio = &pctrl->gpio_bank[reg]; - gpio->pctrl = pctrl; - if (reg >= WPCM450_NUM_BANKS) return dev_err_probe(dev, -EINVAL, "GPIO index %d out of range!\n", reg); + gpio = &pctrl->gpio_bank[reg]; + gpio->pctrl = pctrl; + bank = &wpcm450_banks[reg]; gpio->bank = bank; |