From 352cbc5eb94a271a9c3c0ff5bf1742232a69e0d0 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 25 Nov 2024 16:17:30 +0100
Subject: [PATCH] rawmidi: ump - fix snd_ump_block_info_set_block_id double
 version

Fix mistake snd_ump_block_info_get_block_id / snd_ump_block_info_set_block_id .

Fixes: 76d2d285 ("rawmidi: ump - fix snd_ump_block_info_get_block_id double version")
Link: https://github.com/alsa-project/alsa-lib/issues/422
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
 src/rawmidi/ump.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/rawmidi/ump.c b/src/rawmidi/ump.c
index b1246c33..6807e877 100644
--- a/src/rawmidi/ump.c
+++ b/src/rawmidi/ump.c
@@ -750,20 +750,11 @@ int snd_ump_block_info_get_device(const snd_ump_block_info_t *info)
  * \param info pointer to a snd_ump_block_info_t structure
  * \return ID number of the given UMP block
  */
-#ifndef DOXYGEN
-EXPORT_SYMBOL unsigned int INTERNAL(snd_ump_block_info_get_block_id)(const snd_ump_block_info_t *info)
-#else
 unsigned int snd_ump_block_info_get_block_id(const snd_ump_block_info_t *info)
-#endif
 {
 	return info->block_id;
 }
 
-#ifndef DOC_HIDDEN
-use_symbol_version(__snd_ump_block_info_get_block_id, snd_ump_block_info_get_block_id, ALSA_1.2.10);
-use_default_symbol_version(__snd_ump_block_info_get_block_id, snd_ump_block_info_get_block_id, ALSA_1.2.13);
-#endif /* DOC_HIDDEN */
-
 /**
  * \brief get UMP block activeness
  * \param info pointer to a snd_ump_block_info_t structure
@@ -881,12 +872,22 @@ void snd_ump_block_info_set_device(snd_ump_block_info_t *info, unsigned int devi
  *
  * This function is mostly used for setting the block ID to query.
  */
+#ifndef DOXYGEN
+EXPORT_SYMBOL void INTERNAL(snd_ump_block_info_set_block_id)(snd_ump_block_info_t *info,
+							     unsigned int id)
+#else
 void snd_ump_block_info_set_block_id(snd_ump_block_info_t *info,
 				     unsigned int id)
+#endif
 {
 	info->block_id = id;
 }
 
+#ifndef DOC_HIDDEN
+use_symbol_version(__snd_ump_block_info_set_block_id, snd_ump_block_info_set_block_id, ALSA_1.2.10);
+use_default_symbol_version(__snd_ump_block_info_set_block_id, snd_ump_block_info_set_block_id, ALSA_1.2.13);
+#endif /* DOC_HIDDEN */
+
 /**
  * \brief set activeness to snd_ump_block_info_t structure
  * \param info pointer to a snd_ump_block_info_t structure