diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-10-27 03:50:43 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-10-27 03:50:43 -0400 |
commit | 4fc85e451ff5e9b6ccd7f5cac7f65684755370e2 (patch) | |
tree | 08b0802d18eb23a6f4fea7394a856352836fcec6 /sound/core | |
parent | 9f50bbad8fc3b0f9fd453ab1e2716b3106d89b13 (diff) | |
parent | 67679b1fd166da8398e70b7dbffe12cfccf9c7bf (diff) |
Merge branch 'topic/misc-next' into topic/misc
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 | } |