3 files changed, 15 insertions, 0 deletions

diff --git a/firmware/target/hosted/alsa-controls.c b/firmware/target/hosted/alsa-controls.c
index 9747fbefa9..289f2e76c9 100644
--- a/firmware/target/hosted/alsa-controls.c
+++ b/firmware/target/hosted/alsa-controls.c
@@ -72,6 +72,15 @@ bool alsa_controls_find(snd_ctl_elem_id_t *id, const char *name)
     return false;
 }
 
+bool alsa_has_control(const char *name)
+{
+    snd_ctl_elem_id_t *id;
+    /* allocate things on stack */
+    snd_ctl_elem_id_alloca(&id);
+    /* find control */
+    return alsa_controls_find(id, name);
+}
+
 /* find a control element enum index by name, return -1 if not found */
 int alsa_controls_find_enum(const char *name, const char *enum_name)
 {
diff --git a/firmware/target/hosted/alsa-controls.h b/firmware/target/hosted/alsa-controls.h
index ea2475a98e..f5c8439721 100644
--- a/firmware/target/hosted/alsa-controls.h
+++ b/firmware/target/hosted/alsa-controls.h
@@ -34,6 +34,8 @@ void alsa_controls_close(void);
 /* find a control element ID by name, return false of not found, the id needs
  * to be allocated */
 bool alsa_controls_find(snd_ctl_elem_id_t *id, const char *name);
+/* check wether a control exists */
+bool alsa_has_control(const char *name);
 /* find a control element enum index by name, return -1 if not found */
 int alsa_controls_find_enum(const char *name, const char *enum_name);
 /* set a control, potentially supports several values */
diff --git a/firmware/target/hosted/pcm-alsa.c b/firmware/target/hosted/pcm-alsa.c
index c84679e9f3..f6a3ffce71 100644
--- a/firmware/target/hosted/pcm-alsa.c
+++ b/firmware/target/hosted/pcm-alsa.c
@@ -479,6 +479,10 @@ static void pcm_dma_apply_settings_nolock(void)
 {
     snd_pcm_drop(handle);
     set_hwparams(handle, pcm_sampr);
+#if defined(HAVE_NWZ_LINUX_CODEC)
+    /* Sony NWZ linux driver uses a nonstandard mecanism to set the sampling rate */
+    audiohw_set_frequency(pcm_sampr);
+#endif
 }
 
 void pcm_dma_apply_settings(void)