diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-03-28 22:27:45 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-28 22:27:45 +0100 |
| commit | 3fab191002b184e4390aa07c7149c6cc7b638ec7 (patch) | |
| tree | 821382d49e47c19531bfc3bb9e1f8922486374d4 /sound/ppc/tumbler.c | |
| parent | Merge branches 'x86/apic', 'x86/cleanups' and 'x86/mm' into x86/core (diff) | |
| parent | Merge branch 'percpu-cpumask-x86-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
| download | linux-dev-3fab191002b184e4390aa07c7149c6cc7b638ec7.tar.xz linux-dev-3fab191002b184e4390aa07c7149c6cc7b638ec7.zip | |
Merge branch 'linus' into x86/core
Diffstat (limited to 'sound/ppc/tumbler.c')
| -rw-r--r-- | sound/ppc/tumbler.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c index 3eb223385416..40222fcc0878 100644 --- a/sound/ppc/tumbler.c +++ b/sound/ppc/tumbler.c @@ -41,7 +41,7 @@ #undef DEBUG #ifdef DEBUG -#define DBG(fmt...) printk(fmt) +#define DBG(fmt...) printk(KERN_DEBUG fmt) #else #define DBG(fmt...) #endif @@ -240,7 +240,7 @@ static int tumbler_set_master_volume(struct pmac_tumbler *mix) if (i2c_smbus_write_i2c_block_data(mix->i2c.client, TAS_REG_VOL, 6, block) < 0) { - snd_printk("failed to set volume \n"); + snd_printk(KERN_ERR "failed to set volume \n"); return -EINVAL; } return 0; @@ -350,7 +350,7 @@ static int tumbler_set_drc(struct pmac_tumbler *mix) if (i2c_smbus_write_i2c_block_data(mix->i2c.client, TAS_REG_DRC, 2, val) < 0) { - snd_printk("failed to set DRC\n"); + snd_printk(KERN_ERR "failed to set DRC\n"); return -EINVAL; } return 0; @@ -386,7 +386,7 @@ static int snapper_set_drc(struct pmac_tumbler *mix) if (i2c_smbus_write_i2c_block_data(mix->i2c.client, TAS_REG_DRC, 6, val) < 0) { - snd_printk("failed to set DRC\n"); + snd_printk(KERN_ERR "failed to set DRC\n"); return -EINVAL; } return 0; @@ -506,7 +506,8 @@ static int tumbler_set_mono_volume(struct pmac_tumbler *mix, block[i] = (vol >> ((info->bytes - i - 1) * 8)) & 0xff; if (i2c_smbus_write_i2c_block_data(mix->i2c.client, info->reg, info->bytes, block) < 0) { - snd_printk("failed to set mono volume %d\n", info->index); + snd_printk(KERN_ERR "failed to set mono volume %d\n", + info->index); return -EINVAL; } return 0; @@ -643,7 +644,7 @@ static int snapper_set_mix_vol1(struct pmac_tumbler *mix, int idx, int ch, int r } if (i2c_smbus_write_i2c_block_data(mix->i2c.client, reg, 9, block) < 0) { - snd_printk("failed to set mono volume %d\n", reg); + snd_printk(KERN_ERR "failed to set mono volume %d\n", reg); return -EINVAL; } return 0; |