Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[karo-tx-linux.git] / sound / pci / ca0106 / ca_midi.c

diff --git a/sound/pci/ca0106/ca_midi.c b/sound/pci/ca0106/ca_midi.c
index 8bbdf265d11d240ab6798b8b6d67a65a693a8d2d..b91c7f6d19f9ee28005a91f3af210c3e60c6ea3d 100644 (file)
--- a/sound/pci/ca0106/ca_midi.c
+++ b/sound/pci/ca0106/ca_midi.c
@@ -46,7 +46,7 @@ static void ca_midi_clear_rx(struct snd_ca_midi *midi)
                ca_midi_read_data(midi);
 #ifdef CONFIG_SND_DEBUG
        if (timeout <= 0)
-               snd_printk(KERN_ERR "ca_midi_clear_rx: timeout (status = 0x%x)\n",
+               pr_err("ca_midi_clear_rx: timeout (status = 0x%x)\n",
                           ca_midi_read_stat(midi));
 #endif
 }
@@ -113,7 +113,7 @@ static void ca_midi_cmd(struct snd_ca_midi *midi, unsigned char cmd, int ack)
        }
        spin_unlock_irqrestore(&midi->input_lock, flags);
        if (!ok)
-               snd_printk(KERN_ERR "ca_midi_cmd: 0x%x failed at 0x%x (status = 0x%x, data = 0x%x)!!!\n",
+               pr_err("ca_midi_cmd: 0x%x failed at 0x%x (status = 0x%x, data = 0x%x)!!!\n",
                           cmd,
                           midi->get_dev_id_port(midi->dev_id),
                           ca_midi_read_stat(midi),