Changeset 76 for GPL/trunk/lib32/ossidc.cpp

Timestamp:

Apr 9, 2006, 12:09:39 PM (19 years ago)

Author:

vladest

Message:

Latest ALSA patches
HDA patches
Patch for Intel from Rudy's
Fixes locks on NM256 chipsets
Fixes PM on Maestro3 chipsets

File:

• GPL/trunk/lib32/ossidc.cpp (modified) (2 diffs)

GPL/trunk/lib32/ossidc.cpp

@@ -268 +268 @@
         fnCardExitCall[nrCardsDetected] = name_module_exit(alsa_card_ca0106_exit);
     }
+    if((ForceCard == CARD_NONE || ForceCard == CARD_AZX) &&
+       nrCardsDetected < (OSS32_MAX_AUDIOCARDS-1) && call_module_init(alsa_card_azx_init) == 0)
+    {
+        fnCardExitCall[nrCardsDetected] = name_module_exit(alsa_card_azx_exit);
+    }
     if((ForceCard == CARD_NONE || ForceCard == CARD_BT87X) &&
        nrCardsDetected < (OSS32_MAX_AUDIOCARDS-1) && call_module_init(alsa_card_bt87x_init) == 0)
@@ -273 +278 @@
         fnCardExitCall[nrCardsDetected] = name_module_exit(alsa_card_bt87x_exit);
     }
-    if((ForceCard == CARD_NONE || ForceCard == CARD_AZX) &&
-       nrCardsDetected < (OSS32_MAX_AUDIOCARDS-1) && call_module_init(alsa_card_azx_init) == 0)
-    {
-        fnCardExitCall[nrCardsDetected] = name_module_exit(alsa_card_azx_exit);
-    }
+
 #endif
     fStrategyInit = FALSE;