summaryrefslogtreecommitdiff
path: root/sound/pci/au88x0/au88x0_mpu401.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-12-08 10:33:24 (GMT)
committerTakashi Iwai <tiwai@suse.de>2014-12-08 10:33:24 (GMT)
commit77de61c3975da6f2200935c341e84018ece6ce36 (patch)
tree36508cf93ef62a80c988fa18c86eda1274e03877 /sound/pci/au88x0/au88x0_mpu401.c
parent66139a48cee1530c91f37c145384b4ee7043f0b7 (diff)
parent048184540171672a724ab8f8bada7fcc0762f5c6 (diff)
downloadlinux-77de61c3975da6f2200935c341e84018ece6ce36.tar.xz
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/pci/au88x0/au88x0_mpu401.c')
-rw-r--r--sound/pci/au88x0/au88x0_mpu401.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/au88x0/au88x0_mpu401.c b/sound/pci/au88x0/au88x0_mpu401.c
index 328c194..1025e55 100644
--- a/sound/pci/au88x0/au88x0_mpu401.c
+++ b/sound/pci/au88x0/au88x0_mpu401.c
@@ -73,7 +73,7 @@ static int snd_vortex_midi(vortex_t *vortex)
/* Check if anything is OK. */
temp = hwread(vortex->mmio, VORTEX_MIDI_DATA);
if (temp != MPU401_ACK /*0xfe */ ) {
- pr_err( "midi port doesn't acknowledge!\n");
+ dev_err(vortex->card->dev, "midi port doesn't acknowledge!\n");
return -ENODEV;
}
/* Enable MPU401 interrupts. */