Message ID | 20230929103243.705433-1-amadeuszx.slawinski@linux.intel.com (mailing list archive) |
---|---|
State | Accepted |
Commit | e80f238d2bc0c0f27dc52ac824ca80b938a43ace |
Headers | show |
Series | [1/2] ASoC: core: Print component name when printing log | expand |
On Fri, 29 Sep 2023 12:32:42 +0200, Amadeusz Sławiński wrote: > When printing log related to component it is useful to know, to which > component it applies to. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/2] ASoC: core: Print component name when printing log commit: e80f238d2bc0c0f27dc52ac824ca80b938a43ace [2/2] ASoC: core: Do not call link_exit() on uninitialized rtd objects commit: dd9f9cc1e6b9391140afa5cf27bb47c9e2a08d02 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index c305e94762c3..2b8d522eb106 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1445,8 +1445,8 @@ static int soc_probe_component(struct snd_soc_card *card, if (component->card) { if (component->card != card) { dev_err(component->dev, - "Trying to bind component to card \"%s\" but is already bound to card \"%s\"\n", - card->name, component->card->name); + "Trying to bind component \"%s\" to card \"%s\" but is already bound to card \"%s\"\n", + component->name, card->name, component->card->name); return -ENODEV; } return 0;