ARM64: dts: rk3399: gru: Let VOP Big first to select connector device

[firefly-linux-kernel-4.4.55.git] / sound / pci / emu10k1 / emu10k1_callback.c

diff --git a/sound/pci/emu10k1/emu10k1_callback.c b/sound/pci/emu10k1/emu10k1_callback.c
index f8a6549f00e51a0dc13ecd08603707222b3359c2..d2c7ea3a7610861a15730bb3a8b0c8764205fd5a 100644 (file)
--- a/sound/pci/emu10k1/emu10k1_callback.c
+++ b/sound/pci/emu10k1/emu10k1_callback.c
@@ -105,7 +105,7 @@ snd_emu10k1_synth_get_voice(struct snd_emu10k1 *hw)
                        vp = &emu->voices[best[i].voice];
                        if ((ch = vp->ch) < 0) {
                                /*
-                               printk(KERN_WARNING
+                               dev_warn(emu->card->dev,
                                       "synth_get_voice: ch < 0 (%d) ??", i);
                                */
                                continue;
@@ -337,7 +337,7 @@ start_voice(struct snd_emux_voice *vp)
                return -EINVAL;
        emem->map_locked++;
        if (snd_emu10k1_memblk_map(hw, emem) < 0) {
-               /* printk(KERN_ERR "emu: cannot map!\n"); */
+               /* dev_err(hw->card->devK, "emu: cannot map!\n"); */
                return -ENOMEM;
        }
        mapped_offset = snd_emu10k1_memblk_offset(emem) >> 1;