Pull bugzilla-7897 into release branch

[sfrench/cifs-2.6.git] / sound / isa / gus / gus_volume.c

diff --git a/sound/isa/gus/gus_volume.c b/sound/isa/gus/gus_volume.c
index 3d36f6c8ee6a5fad70579ad8fbb34db15717e01b..dbbc0a6d7659751d58d0e5adf6f2c6d25e47e610 100644 (file)
--- a/sound/isa/gus/gus_volume.c
+++ b/sound/isa/gus/gus_volume.c
@@ -72,7 +72,7 @@ unsigned int snd_gf1_gvol_to_lvol_raw(unsigned short gf1_vol)
        return rvol | (m >> (8 - e));
 }
 
-unsigned int snd_gf1_calc_ramp_rate(snd_gus_card_t * gus,
+unsigned int snd_gf1_calc_ramp_rate(struct snd_gus_card * gus,
                                    unsigned short start,
                                    unsigned short end,
                                    unsigned int us)
@@ -112,14 +112,14 @@ unsigned int snd_gf1_calc_ramp_rate(snd_gus_card_t * gus,
 
 #endif  /*  0  */
 
-unsigned short snd_gf1_translate_freq(snd_gus_card_t * gus, unsigned int freq16)
+unsigned short snd_gf1_translate_freq(struct snd_gus_card * gus, unsigned int freq16)
 {
        freq16 >>= 3;
        if (freq16 < 50)
                freq16 = 50;
        if (freq16 & 0xf8000000) {
                freq16 = ~0xf8000000;
-               snd_printk("snd_gf1_translate_freq: overflow - freq = 0x%x\n", freq16);
+               snd_printk(KERN_ERR "snd_gf1_translate_freq: overflow - freq = 0x%x\n", freq16);
        }
        return ((freq16 << 9) + (gus->gf1.playback_freq >> 1)) / gus->gf1.playback_freq;
 }
@@ -203,14 +203,14 @@ unsigned short snd_gf1_compute_freq(unsigned int freq,
        fc = (freq << 10) / rate;
        if (fc > 97391L) {
                fc = 97391;
-               snd_printk("patch: (1) fc frequency overflow - %u\n", fc);
+               snd_printk(KERN_ERR "patch: (1) fc frequency overflow - %u\n", fc);
        }
        fc = (fc * 44100UL) / mix_rate;
        while (scale--)
                fc <<= 1;
        if (fc > 65535L) {
                fc = 65535;
-               snd_printk("patch: (2) fc frequency overflow - %u\n", fc);
+               snd_printk(KERN_ERR "patch: (2) fc frequency overflow - %u\n", fc);
        }
        return (unsigned short) fc;
 }