]> Pileus Git - ~andy/linux/commitdiff
Bluetooth: Fix uuid output in debugfs
authorGustavo Padovan <gustavo.padovan@collabora.co.uk>
Thu, 10 Jan 2013 08:06:29 +0000 (06:06 -0200)
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>
Thu, 10 Jan 2013 18:32:35 +0000 (16:32 -0200)
The uuid should be printed in the CPU endianness and not in little-endian.

Acked-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
net/bluetooth/hci_sysfs.c

index 55cceee02a840598d8b8f49d9f6b0ad989719ba8..23b4e242a31a9703cf27c206a1bc66cf8feb0c6b 100644 (file)
@@ -2,6 +2,7 @@
 
 #include <linux/debugfs.h>
 #include <linux/module.h>
+#include <asm/unaligned.h>
 
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
@@ -461,19 +462,18 @@ static const struct file_operations blacklist_fops = {
 
 static void print_bt_uuid(struct seq_file *f, u8 *uuid)
 {
-       __be32 data0, data4;
-       __be16 data1, data2, data3, data5;
+       u32 data0, data5;
+       u16 data1, data2, data3, data4;
 
-       memcpy(&data0, &uuid[0], 4);
-       memcpy(&data1, &uuid[4], 2);
-       memcpy(&data2, &uuid[6], 2);
-       memcpy(&data3, &uuid[8], 2);
-       memcpy(&data4, &uuid[10], 4);
-       memcpy(&data5, &uuid[14], 2);
+       data5 = get_unaligned_le32(uuid);
+       data4 = get_unaligned_le16(uuid + 4);
+       data3 = get_unaligned_le16(uuid + 6);
+       data2 = get_unaligned_le16(uuid + 8);
+       data1 = get_unaligned_le16(uuid + 10);
+       data0 = get_unaligned_le32(uuid + 12);
 
-       seq_printf(f, "%.8x-%.4x-%.4x-%.4x-%.8x%.4x\n",
-                  ntohl(data0), ntohs(data1), ntohs(data2), ntohs(data3),
-                  ntohl(data4), ntohs(data5));
+       seq_printf(f, "%.8x-%.4x-%.4x-%.4x-%.4x%.8x\n",
+                  data0, data1, data2, data3, data4, data5);
 }
 
 static int uuids_show(struct seq_file *f, void *p)