summaryrefslogtreecommitdiff
path: root/sound/core/device.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2008-12-01 14:57:26 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2008-12-01 14:57:26 +1100
commit24c88f180593a4c6d22590f2607f77be3fc8eb12 (patch)
tree2ef4991c1d5925461cc38ec56338a81033913a96 /sound/core/device.c
parentd5bdd4048e69def66b9eaf0b71d9fdc07cfe22a1 (diff)
parent0772c0e7d2f0664126fdae38c69550bea4f5809c (diff)
Merge commit 'sound/for-next'
Diffstat (limited to 'sound/core/device.c')
-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;
}