Changeset 552 for GPL/branches


Ignore:
Timestamp:
Apr 20, 2011, 8:41:42 PM (14 years ago)
Author:
David Azarewicz
Message:

merge changes from trunk

Location:
GPL/branches/uniaud32-2.1.x
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • GPL/branches/uniaud32-2.1.x/alsa-kernel/pci/hda/hda_intel.c

    r519 r552  
    696696 again:
    697697        timeout = jiffies + msecs_to_jiffies(1000);
    698         for (;;) {
     698        for ( ; ; ) {
    699699                if (chip->polling_mode || do_poll) {
    700700                        spin_lock_irq(&chip->reg_lock);
    … …  
    745745        }
    746746#ifdef TARGET_OS2
    747         if (count >= 5000)
     747        if (count >= 5000) {
    748748                snd_printk(KERN_WARNING "hda_intel: count >= 5000, aborting loop in azx_rirb_get_response\n");
     749        }
    749750#endif
    750751        if (chip->msi) {

  • GPL/branches/uniaud32-2.1.x/lib32/irq.c

    r550 r552  
    8686                if (RMRequestIRQ(irq, (ulSharedFlag & SA_SHIRQ) != 0, &hRes) == FALSE) {
    8787                        rprintf(("RMRequestIRQ failed for irq %d", irq));
    88                         //      return 0;
     88                        return 1;
    8989                }
    9090                pSlot->irqNo = irq & 0xff;

  • GPL/branches/uniaud32-2.1.x/uniaud.inc

    r550 r552  
    1313# ex RC3  GA  FIXPACK2 beta_47
    1414# Comment out to avoid a fixpack line in bldlevel
    15 FIXPACK = BETA SVNr550
     15FIXPACK = BETA SVN552
    1616
    1717# ALSA BUILD VERSION
Note: See TracChangeset for help on using the changeset viewer.