target/linux/pxa/patches-2.6.21/026-pcm-gcc-411-bugfix.patch

   1 --- a/include/sound/pcm_params.h
   2 +++ b/include/sound/pcm_params.h
   3 @@ -179,16 +179,8 @@ static inline int snd_mask_single(const
   4         return 1;
   5  }
   6
   7 -static inline int snd_mask_refine(struct snd_mask *mask,
   8 -                                 const struct snd_mask *v)
   9 -{
  10 -       struct snd_mask old;
  11 -       snd_mask_copy(&old, mask);
  12 -       snd_mask_intersect(mask, v);
  13 -       if (snd_mask_empty(mask))
  14 -               return -EINVAL;
  15 -       return !snd_mask_eq(mask, &old);
  16 -}
  17 +void snd_mask_print( const struct snd_mask *m1, const struct snd_mask *m2 );
  18 +int snd_mask_refine(struct snd_mask *mask, const struct snd_mask *v);
  19
  20  static inline int snd_mask_refine_first(struct snd_mask *mask)
  21  {
  22 --- a/sound/core/pcm_lib.c
  23 +++ b/sound/core/pcm_lib.c
  24 @@ -2128,3 +2128,18 @@ snd_pcm_sframes_t snd_pcm_lib_readv(stru
  25  }
  26
  27  EXPORT_SYMBOL(snd_pcm_lib_readv);
  28 +
  29 +int snd_mask_refine(struct snd_mask *mask,
  30 +                                 const struct snd_mask *v)
  31 +{
  32 +       struct snd_mask old;
  33 +       snd_mask_copy(&old, mask);
  34 +       snd_mask_print(mask, v);
  35 +       snd_mask_intersect(mask, v);
  36 +       snd_mask_print(mask, v);
  37 +       if (snd_mask_empty(mask))
  38 +               return -EINVAL;
  39 +       return !snd_mask_eq(mask, &old);
  40 +}
  41 +
  42 +EXPORT_SYMBOL(snd_mask_refine);
  43 --- a/sound/core/pcm_native.c
  44 +++ b/sound/core/pcm_native.c
  45 @@ -3450,3 +3450,9 @@ const struct file_operations snd_pcm_f_o
  46                 .fasync =               snd_pcm_fasync,
  47         }
  48  };
  49 +
  50 +void snd_mask_print( const struct snd_mask *m1, const struct snd_mask *m2 )
  51 +{
  52 +//    printk( "0x%08x %08x v: 0x%08x %08x\n", m1->bits[1], m1->bits[0], m2->bits[1], m2->bits[0] );
  53 +}
  54 +