Merge tag 'drivers-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[deliverable/linux.git] / sound / core / vmaster.c

diff --git a/sound/core/vmaster.c b/sound/core/vmaster.c
index 842a97d5fc3a1ec104fcd691597e07095c3fa76d..6c58e6f73a013bd33e47cc9a7ea8c1b46b7f17df 100644 (file)
--- a/sound/core/vmaster.c
+++ b/sound/core/vmaster.c
@@ -101,7 +101,7 @@ static int slave_init(struct link_slave *slave)
        if (slave->info.count > 2  ||
            (slave->info.type != SNDRV_CTL_ELEM_TYPE_INTEGER &&
             slave->info.type != SNDRV_CTL_ELEM_TYPE_BOOLEAN)) {
-               snd_printk(KERN_ERR "invalid slave element\n");
+               pr_err("ALSA: vmaster: invalid slave element\n");
                kfree(uinfo);
                return -EINVAL;
        }