diff options
author | Mark Brown <broonie@kernel.org> | 2021-12-01 14:15:12 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2021-12-01 14:15:12 +0000 |
commit | 67140b64b68395b79177efcd16a7530ed5311e49 (patch) | |
tree | b1843f4e04d9c0f1d749add23f78ed2ddc84e7ed /sound/soc/amd | |
parent | f316c9d9ba8ea08d6994bc5ba8fa276eab186208 (diff) | |
parent | 046aede2f847676f93a2ea4f48b77909c51dba40 (diff) |
Merge branch 'for-5.16' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.17 so we can apply new Tegra work
Diffstat (limited to 'sound/soc/amd')
-rw-r--r-- | sound/soc/amd/yc/pci-acp6x.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/amd/yc/pci-acp6x.c b/sound/soc/amd/yc/pci-acp6x.c index 957eeb6fb8e3..7e9a9a9d8ddd 100644 --- a/sound/soc/amd/yc/pci-acp6x.c +++ b/sound/soc/amd/yc/pci-acp6x.c @@ -146,10 +146,11 @@ static int snd_acp6x_probe(struct pci_dev *pci, { struct acp6x_dev_data *adata; struct platform_device_info pdevinfo[ACP6x_DEVS]; - int ret, index; + int index = 0; int val = 0x00; u32 addr; unsigned int irqflags; + int ret; irqflags = IRQF_SHARED; /* Yellow Carp device check */ |