Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / uwb / address.c

diff --git a/drivers/uwb/address.c b/drivers/uwb/address.c
index 973321327c44b897ae3ae14eb95f2d33b784732f..8739c4f4d015a3cac54ed8881f660eb954ebd6f1 100644 (file)
--- a/drivers/uwb/address.c
+++ b/drivers/uwb/address.c
@@ -363,10 +363,7 @@ size_t __uwb_addr_print(char *buf, size_t buf_size, const unsigned char *addr,
 {
        size_t result;
        if (type)
-               result = scnprintf(buf, buf_size,
-                                 "%02x:%02x:%02x:%02x:%02x:%02x",
-                                 addr[0], addr[1], addr[2],
-                                 addr[3], addr[4], addr[5]);
+               result = scnprintf(buf, buf_size, "%pM", addr);
        else
                result = scnprintf(buf, buf_size, "%02x:%02x",
                                  addr[1], addr[0]);