diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-11-26 08:12:42 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-11-26 08:12:42 -0500 |
| commit | e7dd8c1bdacf658b0ade51facb2f7eaf40eb0ac4 (patch) | |
| tree | 0db15820fdd391a1570e1257167e8f02532c83f5 /sound/core | |
| parent | ed313489badef16d700f5a3be50e8fd8f8294bc8 (diff) | |
| parent | bc4a68fed4b4c01005ef3c71ede6a8cbe91b7dc9 (diff) | |
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) | |||
| 98 | kfree(dev); | 98 | kfree(dev); |
| 99 | return 0; | 99 | return 0; |
| 100 | } | 100 | } |
| 101 | snd_printd("device free %p (from %p), not found\n", device_data, | 101 | snd_printd("device free %p (from %pF), not found\n", device_data, |
| 102 | __builtin_return_address(0)); | 102 | __builtin_return_address(0)); |
| 103 | return -ENXIO; | 103 | return -ENXIO; |
| 104 | } | 104 | } |
| @@ -135,7 +135,7 @@ int snd_device_disconnect(struct snd_card *card, void *device_data) | |||
| 135 | } | 135 | } |
| 136 | return 0; | 136 | return 0; |
| 137 | } | 137 | } |
| 138 | snd_printd("device disconnect %p (from %p), not found\n", device_data, | 138 | snd_printd("device disconnect %p (from %pF), not found\n", device_data, |
| 139 | __builtin_return_address(0)); | 139 | __builtin_return_address(0)); |
| 140 | return -ENXIO; | 140 | return -ENXIO; |
| 141 | } | 141 | } |