summaryrefslogtreecommitdiffstats
path: root/sound/core
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-10-27 08:50:43 +0100
committerTakashi Iwai <tiwai@suse.de>2008-10-27 08:50:43 +0100
commit4fc85e451ff5e9b6ccd7f5cac7f65684755370e2 (patch)
tree08b0802d18eb23a6f4fea7394a856352836fcec6 /sound/core
parentALSA: aoa i2sbus: don't overwrite module parameter (diff)
parentALSA: emu10k1: fix coding style for emu10k1_main.c (diff)
downloadlinux-4fc85e451ff5e9b6ccd7f5cac7f65684755370e2.tar.xz
linux-4fc85e451ff5e9b6ccd7f5cac7f65684755370e2.zip
Merge branch 'topic/misc-next' into topic/misc
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/device.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/core/device.c b/sound/core/device.c
index c58d8227254c..a67dfac08c03 100644
--- a/sound/core/device.c
+++ b/sound/core/device.c
@@ -98,7 +98,7 @@ int snd_device_free(struct snd_card *card, void *device_data)
kfree(dev);
return 0;
}
- snd_printd("device free %p (from %p), not found\n", device_data,
+ snd_printd("device free %p (from %pF), not found\n", device_data,
__builtin_return_address(0));
return -ENXIO;
}
@@ -135,7 +135,7 @@ int snd_device_disconnect(struct snd_card *card, void *device_data)
}
return 0;
}
- snd_printd("device disconnect %p (from %p), not found\n", device_data,
+ snd_printd("device disconnect %p (from %pF), not found\n", device_data,
__builtin_return_address(0));
return -ENXIO;
}