--- /dev/null
+From 66a0a2b0473c39ae85c44628d14e4366fdc0aa0d Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Fri, 20 Dec 2024 12:44:16 +0100
+Subject: ALSA: sh: Fix wrong argument order for copy_from_iter()
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit 66a0a2b0473c39ae85c44628d14e4366fdc0aa0d upstream.
+
+Fix a brown paper bag bug I introduced at converting to the standard
+iter helper; the arguments were wrongly passed and have to be
+swapped.
+
+Fixes: 9b5f8ee43e48 ("ALSA: sh: Use standard helper for buffer accesses")
+Reported-by: kernel test robot <lkp@intel.com>
+Closes: https://lore.kernel.org/oe-kbuild-all/202412140019.jat5Dofr-lkp@intel.com/
+Link: https://patch.msgid.link/20241220114417.5898-1-tiwai@suse.de
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/sh/sh_dac_audio.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sound/sh/sh_dac_audio.c
++++ b/sound/sh/sh_dac_audio.c
+@@ -163,7 +163,7 @@ static int snd_sh_dac_pcm_copy(struct sn
+ /* channel is not used (interleaved data) */
+ struct snd_sh_dac *chip = snd_pcm_substream_chip(substream);
+
+- if (copy_from_iter(chip->data_buffer + pos, src, count) != count)
++ if (copy_from_iter(chip->data_buffer + pos, count, src) != count)
+ return -EFAULT;
+ chip->buffer_end = chip->data_buffer + pos + count;
+
--- /dev/null
+From ed990c07af70d286f5736021c6e25d8df6f2f7b0 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Sat, 30 Nov 2024 10:00:08 +0100
+Subject: ALSA: ump: Shut up truncated string warning
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit ed990c07af70d286f5736021c6e25d8df6f2f7b0 upstream.
+
+The recent change for the legacy substream name update brought a
+compile warning for some compilers due to the nature of snprintf().
+Use scnprintf() to shut up the warning since the truncation is
+intentional.
+
+Fixes: e29e504e7890 ("ALSA: ump: Indicate the inactive group in legacy substream names")
+Reported-by: kernel test robot <lkp@intel.com>
+Closes: https://lore.kernel.org/oe-kbuild-all/202411300103.FrGuTAYp-lkp@intel.com/
+Link: https://patch.msgid.link/20241130090009.19849-1-tiwai@suse.de
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/core/ump.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/sound/core/ump.c
++++ b/sound/core/ump.c
+@@ -1262,9 +1262,9 @@ static void fill_substream_names(struct
+ name = ump->groups[idx].name;
+ if (!*name)
+ name = ump->info.name;
+- snprintf(s->name, sizeof(s->name), "Group %d (%.16s)%s",
+- idx + 1, name,
+- ump->groups[idx].active ? "" : " [Inactive]");
++ scnprintf(s->name, sizeof(s->name), "Group %d (%.16s)%s",
++ idx + 1, name,
++ ump->groups[idx].active ? "" : " [Inactive]");
+ }
+ }
+
+++ /dev/null
-From b4a1ba400db8ba3c210bc37b0f5838dc89535b68 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 21 Oct 2024 15:39:02 +0900
-Subject: watchdog: s3c2410_wdt: add support for exynosautov920 SoC
-
-From: Byoungtae Cho <bt.cho@samsung.com>
-
-[ Upstream commit a5cb13980e00e9c4fbc382d68eda250ab6a14d7c ]
-
-Adds the compatibles and drvdata for the ExynosAuto V920 SoC. This SoC
-is almost similar to ExynosAutoV9, but some CPU configurations are quite
-different, so it should be added. Plus it also support DBGACK like as
-GS101 SoC.
-
-Signed-off-by: Byoungtae Cho <bt.cho@samsung.com>
-Signed-off-by: Taewan Kim <trunixs.kim@samsung.com>
-Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
-Reviewed-by: Guenter Roeck <linux@roeck-us.net>
-Link: https://lore.kernel.org/r/20241021063903.793166-3-trunixs.kim@samsung.com
-Signed-off-by: Guenter Roeck <linux@roeck-us.net>
-Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/watchdog/s3c2410_wdt.c | 37 +++++++++++++++++++++++++++++++++-
- 1 file changed, 36 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
-index 349d30462c8c..30450e99e5e9 100644
---- a/drivers/watchdog/s3c2410_wdt.c
-+++ b/drivers/watchdog/s3c2410_wdt.c
-@@ -63,6 +63,10 @@
- #define EXYNOS850_CLUSTER1_NONCPU_INT_EN 0x1644
- #define EXYNOSAUTOV9_CLUSTER1_NONCPU_OUT 0x1520
- #define EXYNOSAUTOV9_CLUSTER1_NONCPU_INT_EN 0x1544
-+#define EXYNOSAUTOV920_CLUSTER0_NONCPU_OUT 0x1420
-+#define EXYNOSAUTOV920_CLUSTER0_NONCPU_INT_EN 0x1444
-+#define EXYNOSAUTOV920_CLUSTER1_NONCPU_OUT 0x1720
-+#define EXYNOSAUTOV920_CLUSTER1_NONCPU_INT_EN 0x1744
-
- #define EXYNOS850_CLUSTER0_WDTRESET_BIT 24
- #define EXYNOS850_CLUSTER1_WDTRESET_BIT 23
-@@ -303,6 +307,32 @@ static const struct s3c2410_wdt_variant drv_data_gs101_cl1 = {
- QUIRK_HAS_DBGACK_BIT,
- };
-
-+static const struct s3c2410_wdt_variant drv_data_exynosautov920_cl0 = {
-+ .mask_reset_reg = EXYNOSAUTOV920_CLUSTER0_NONCPU_INT_EN,
-+ .mask_bit = 2,
-+ .mask_reset_inv = true,
-+ .rst_stat_reg = EXYNOS5_RST_STAT_REG_OFFSET,
-+ .rst_stat_bit = EXYNOSAUTOV9_CLUSTER0_WDTRESET_BIT,
-+ .cnt_en_reg = EXYNOSAUTOV920_CLUSTER0_NONCPU_OUT,
-+ .cnt_en_bit = 7,
-+ .quirks = QUIRK_HAS_WTCLRINT_REG | QUIRK_HAS_PMU_MASK_RESET |
-+ QUIRK_HAS_PMU_RST_STAT | QUIRK_HAS_PMU_CNT_EN |
-+ QUIRK_HAS_DBGACK_BIT,
-+};
-+
-+static const struct s3c2410_wdt_variant drv_data_exynosautov920_cl1 = {
-+ .mask_reset_reg = EXYNOSAUTOV920_CLUSTER1_NONCPU_INT_EN,
-+ .mask_bit = 2,
-+ .mask_reset_inv = true,
-+ .rst_stat_reg = EXYNOS5_RST_STAT_REG_OFFSET,
-+ .rst_stat_bit = EXYNOSAUTOV9_CLUSTER1_WDTRESET_BIT,
-+ .cnt_en_reg = EXYNOSAUTOV920_CLUSTER1_NONCPU_OUT,
-+ .cnt_en_bit = 7,
-+ .quirks = QUIRK_HAS_WTCLRINT_REG | QUIRK_HAS_PMU_MASK_RESET |
-+ QUIRK_HAS_PMU_RST_STAT | QUIRK_HAS_PMU_CNT_EN |
-+ QUIRK_HAS_DBGACK_BIT,
-+};
-+
- static const struct of_device_id s3c2410_wdt_match[] = {
- { .compatible = "google,gs101-wdt",
- .data = &drv_data_gs101_cl0 },
-@@ -320,6 +350,8 @@ static const struct of_device_id s3c2410_wdt_match[] = {
- .data = &drv_data_exynos850_cl0 },
- { .compatible = "samsung,exynosautov9-wdt",
- .data = &drv_data_exynosautov9_cl0 },
-+ { .compatible = "samsung,exynosautov920-wdt",
-+ .data = &drv_data_exynosautov920_cl0 },
- {},
- };
- MODULE_DEVICE_TABLE(of, s3c2410_wdt_match);
-@@ -643,7 +675,8 @@ s3c2410_get_wdt_drv_data(struct platform_device *pdev, struct s3c2410_wdt *wdt)
- /* Choose Exynos850/ExynosAutov9 driver data w.r.t. cluster index */
- if (variant == &drv_data_exynos850_cl0 ||
- variant == &drv_data_exynosautov9_cl0 ||
-- variant == &drv_data_gs101_cl0) {
-+ variant == &drv_data_gs101_cl0 ||
-+ variant == &drv_data_exynosautov920_cl0) {
- u32 index;
- int err;
-
-@@ -662,6 +695,8 @@ s3c2410_get_wdt_drv_data(struct platform_device *pdev, struct s3c2410_wdt *wdt)
- variant = &drv_data_exynosautov9_cl1;
- else if (variant == &drv_data_gs101_cl0)
- variant = &drv_data_gs101_cl1;
-+ else if (variant == &drv_data_exynosautov920_cl0)
-+ variant = &drv_data_exynosautov920_cl1;
- break;
- default:
- return dev_err_probe(dev, -EINVAL, "wrong cluster index: %u\n", index);
---
-2.39.5
-
projects / thirdparty / kernel / stable-queue.git / commitdiff
