diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-11-26 14:12:42 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-11-26 14:12:42 +0100 |
| commit | e7dd8c1bdacf658b0ade51facb2f7eaf40eb0ac4 (patch) | |
| tree | 0db15820fdd391a1570e1257167e8f02532c83f5 /sound/core | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| parent | ALSA: snd-powermac: enable mic on iMac G4 (diff) | |
| download | linux-e7dd8c1bdacf658b0ade51facb2f7eaf40eb0ac4.tar.xz linux-e7dd8c1bdacf658b0ade51facb2f7eaf40eb0ac4.zip | |
Merge branch 'topic/misc' into topic/pcsp-fix
Conflicts:
sound/drivers/pcsp/pcsp_lib.c
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/device.c | 4 |
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; } |