From: Mark Brown <broonie@kernel.org>
Date: Mon, 30 Nov 2020 16:05:07 +0000 (+0000)
Subject: Merge branch 'for-5.10' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: v5.11-rc4~27^2~11^2~61
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e5879d988291a964a87c4868057dc989d901eea0;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'for-5.10' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.11
---

e5879d988291a964a87c4868057dc989d901eea0
diff --cc sound/soc/amd/raven/pci-acp3x.c
index cd5b097a9402a,a7de4e6079618..bd0b1554bd4eb
--- a/sound/soc/amd/raven/pci-acp3x.c
+++ b/sound/soc/amd/raven/pci-acp3x.c
@@@ -231,7 -231,9 +231,8 @@@ static int snd_acp3x_probe(struct pci_d
  		}
  		break;
  	default:
 -		dev_info(&pci->dev, "Invalid ACP audio mode : %d\n", val);
 -		ret = -ENODEV;
 -		goto disable_msi;
 +		dev_info(&pci->dev, "ACP audio mode : %d\n", val);
++		break;
  	}
  	pm_runtime_set_autosuspend_delay(&pci->dev, 2000);
  	pm_runtime_use_autosuspend(&pci->dev);