Merge branch 'topic/convert-tasklet' into to-push
Takashi Iwai [Thu, 25 Dec 2008 10:40:27 +0000 (11:40 +0100)]
1  2 
sound/pci/pcxhr/pcxhr.c
sound/pci/riptide/riptide.c

diff --combined sound/pci/pcxhr/pcxhr.c
@@@ -653,7 -653,7 +653,7 @@@ static int pcxhr_trigger(struct snd_pcm
                                        PCXHR_STREAM_STATUS_SCHEDULE_RUN;
                                snd_pcm_trigger_done(s, subs);
                        }
-                       tasklet_hi_schedule(&chip->mgr->trigger_taskq);
+                       tasklet_schedule(&chip->mgr->trigger_taskq);
                } else {
                        stream = subs->runtime->private_data;
                        snd_printdd("Only one Substream %c %d\n",
@@@ -1024,7 -1024,7 +1024,7 @@@ static int __devinit pcxhr_create(struc
                .dev_free = pcxhr_chip_dev_free,
        };
  
 -      mgr->chip[idx] = chip = kzalloc(sizeof(*chip), GFP_KERNEL);
 +      chip = kzalloc(sizeof(*chip), GFP_KERNEL);
        if (! chip) {
                snd_printk(KERN_ERR "cannot allocate chip\n");
                return -ENOMEM;
                return err;
        }
  
 +      mgr->chip[idx] = chip;
        snd_card_set_dev(card, &mgr->pci->dev);
  
        return 0;
@@@ -1311,7 -1310,6 +1311,7 @@@ static int __devinit pcxhr_probe(struc
                sprintf(card->longname, "%s [PCM #%d]", mgr->longname, i);
  
                if ((err = pcxhr_create(mgr, card, i)) < 0) {
 +                      snd_card_free(card);
                        pcxhr_free(mgr);
                        return err;
                }
@@@ -172,7 -172,7 +172,7 @@@ MODULE_PARM_DESC(opl3_port, "OPL3 port 
  
  #define MAX_WRITE_RETRY  10   /* cmd interface limits */
  #define MAX_ERROR_COUNT  10
 -#define CMDIF_TIMEOUT    500000
 +#define CMDIF_TIMEOUT    50000
  #define RESET_TRIES      5
  
  #define READ_PORT_ULONG(p)     inl((unsigned long)&(p))
@@@ -1754,7 -1754,7 +1754,7 @@@ snd_riptide_interrupt(int irq, void *de
                if (IS_EOBIRQ(cif->hwport) || IS_EOSIRQ(cif->hwport) ||
                    IS_EOCIRQ(cif->hwport)) {
                        chip->handled_irqs++;
-                       tasklet_hi_schedule(&chip->riptide_tq);
+                       tasklet_schedule(&chip->riptide_tq);
                }
                if (chip->rmidi && IS_MPUIRQ(cif->hwport)) {
                        chip->handled_irqs++;