Re: 2.5.5-dj2 compile failures

From: Zwane Mwaikambo (zwane@linux.realnet.co.sz)
Date: Wed Feb 27 2002 - 09:16:11 EST


On Wed, 27 Feb 2002, Roberto Nibali wrote:

> >>RTC Timer support failed - but maybe I don't need that
> >>
> >>Generic ESS ES18xx driver also failed to compile, - so no sound here.
> >>
> >
> > Aargh i think thats me too! I'll have a look.
>
> I sent in patches for the RTC Timer compile fix (interrupt.h was
> missing) last night [1] but I only cc'd to dj and the ALSA maintainer. I
> haven't fixed the ESS driver though.

Heres the es18xx fix, few ALSA API changes it seems.

        Zwane

Diffed against 2.5.5-dj2

--- linux-2.5.5-pre1/sound/isa/es18xx.c.orig Wed Feb 27 16:04:15 2002
+++ linux-2.5.5-pre1/sound/isa/es18xx.c Wed Feb 27 16:13:11 2002
@@ -1603,7 +1603,7 @@
         sprintf(pcm->name, "ESS AudioDrive ES%x", chip->version);
         chip->pcm = pcm;
 
- snd_pcm_lib_preallocate_isa_pages_for_all(pcm, 64*1024, chip->dma1 > 3 || chip->dma2 > 3 ? 128*1024 : 64*1024, GFP_KERNEL|GFP_DMA);
+ snd_pcm_lib_preallocate_isa_pages_for_all(pcm, 64*1024, chip->dma1 > 3 || chip->dma2 > 3 ? 128*1024 : 64*1024);
 
         if (rpcm)
                 *rpcm = pcm;
@@ -1616,7 +1616,7 @@
 {
         snd_card_t *card = chip->card;
 
- snd_power_lock(card, can_schedule);
+ snd_power_lock(card);
         if (card->power_state == SNDRV_CTL_POWER_D3hot)
                 goto __skip;
 
@@ -1637,7 +1637,7 @@
 {
         snd_card_t *card = chip->card;
 
- snd_power_lock(card, can_schedule);
+ snd_power_lock(card);
         if (card->power_state == SNDRV_CTL_POWER_D0)
                 goto __skip;
 

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Thu Feb 28 2002 - 21:00:37 EST