37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
|
From b60350d9f495f568aa1380f02a13b51e9619a7de Mon Sep 17 00:00:00 2001
|
||
|
|
From: gubin <gubin_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Mon, 18 Nov 2024 14:17:52 +0800
|
||
|
|
Subject: [PATCH] audio/audio.c: remove trailing newline in error_setg
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
cherry-pick from 09a36158c283f7448d1b00fdbb6634f05d27f922
|
||
|
|
|
||
|
|
error_setg() appends newline to the formatted message.
|
||
|
|
Fixes: cb94ff5f80c5 ("audio: propagate Error * out of audio_init")
|
||
|
|
|
||
|
|
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
|
||
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
||
|
|
Signed-off-by: gubin <gubin_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
audio/audio.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/audio/audio.c b/audio/audio.c
|
||
|
|
index 8d1e4ad922..7ac74f9e16 100644
|
||
|
|
--- a/audio/audio.c
|
||
|
|
+++ b/audio/audio.c
|
||
|
|
@@ -1744,7 +1744,7 @@ static AudioState *audio_init(Audiodev *dev, Error **errp)
|
||
|
|
if (driver) {
|
||
|
|
done = !audio_driver_init(s, driver, dev, errp);
|
||
|
|
} else {
|
||
|
|
- error_setg(errp, "Unknown audio driver `%s'\n", drvname);
|
||
|
|
+ error_setg(errp, "Unknown audio driver `%s'", drvname);
|
||
|
|
}
|
||
|
|
if (!done) {
|
||
|
|
goto out;
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|