Changeset 551

Timestamp:

Apr 20, 2011, 7:40:41 PM (14 years ago)

Author:

David Azarewicz

Message:

changed init to fail if RM failure

Location:

GPL/trunk

Files:

• alsa-kernel/pci/hda/hda_intel.c (modified) (2 diffs)
• lib32/irq.c (modified) (1 diff)
• uniaud.inc (modified) (1 diff)

GPL/trunk/alsa-kernel/pci/hda/hda_intel.c

@@ -681 +681 @@
  again:
         timeout = jiffies + msecs_to_jiffies(1000);
-        for (;;) {
+        for ( ; ; ) {
                 if (chip->polling_mode) {
                         spin_lock_irq(&chip->reg_lock);
@@ -709 +709 @@
         }
 #ifdef TARGET_OS2
-        if (count >= 5000)
+        if (count >= 5000) {
                 snd_printk(KERN_WARNING "hda_intel: count >= 5000, aborting loop in azx_rirb_get_response\n");
-
+        }
 #endif
         if (chip->msi) {

GPL/trunk/lib32/irq.c

@@ -86 +86 @@
                 if (RMRequestIRQ(irq, (ulSharedFlag & SA_SHIRQ) != 0, &hRes) == FALSE) {
                         rprintf(("RMRequestIRQ failed for irq %d", irq));
-                        //      return 0;
+                        return 1;
                 }
                 pSlot->irqNo = irq & 0xff;

GPL/trunk/uniaud.inc

@@ -13 +13 @@
 # ex RC3  GA  FIXPACK2 beta_47
 # Comment out to avoid a fixpack line in bldlevel
-FIXPACK = SVNr549
+FIXPACK = SVN551
 
 # ALSA BUILD VERSION