Changeset 672

Timestamp:

Jan 31, 2021, 9:57:28 AM (5 years ago)

Author:

Paul Smedley

Message:

Don't call snd_device_free() when closing a pcm stream on OS/2, remove workaround for HDA hardware from lib32/sound.c

Location:

GPL/branches/uniaud32-next

Files:

• alsa-kernel/pci/hda/hda_codec.c (modified) (1 diff)
• lib32/sound.c (modified) (2 diffs)

GPL/branches/uniaud32-next/alsa-kernel/pci/hda/hda_codec.c

@@ -715 +715 @@
 {
         struct hda_pcm *pcm = container_of(kref, struct hda_pcm, kref);
-
+#ifndef TARGET_OS2
+/* don't do this on OS/2 - results in the device being free'd and can't be re-opened */
         if (pcm->pcm)
                 snd_device_free(pcm->codec->card, pcm->pcm);
+#endif
         clear_bit(pcm->device, pcm->codec->bus->pcm_dev_bits);
         kfree(pcm->name);

GPL/branches/uniaud32-next/lib32/sound.c

@@ -619 +619 @@
                 {
                         dprintf(("Found phandle for closing: %x reuse flag: %i\n", pHandle, opened_handles[i].reuse));
-#if 0 //2020-12-27
                         if (!opened_handles[i].reuse)
                         {
@@ -627 +626 @@
                                 OSS32_CloseUNI16(); /* say to UNIAUD16 that we closing now */
                         } else
-#endif
                         {
                                 /* prepare for reuse */