Merge remote-tracking branch 'block/for-next'

[karo-tx-linux.git] / net / bluetooth / hci_core.c

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index b5c8cb3c96d2f50e5f60d1f04d4f6a55f207edcb..6ccc4eb9e55e4958f3eb070894a7668b05c98b5b 100644 (file)
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -193,18 +193,16 @@ static int uuids_show(struct seq_file *f, void *p)
 
        hci_dev_lock(hdev);
        list_for_each_entry(uuid, &hdev->uuids, list) {
-               u32 data0, data5;
-               u16 data1, data2, data3, data4;
+               u8 i, val[16];
 
-               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);
+               /* The Bluetooth UUID values are stored in big endian,
+                * but with reversed byte order. So convert them into
+                * the right order for the %pUb modifier.
+                */
+               for (i = 0; i < 16; i++)
+                       val[i] = uuid->uuid[15 - i];
 
-               seq_printf(f, "%.8x-%.4x-%.4x-%.4x-%.4x%.8x\n",
-                          data0, data1, data2, data3, data4, data5);
+               seq_printf(f, "%pUb\n", val);
        }
        hci_dev_unlock(hdev);
 
@@ -425,7 +423,7 @@ static int idle_timeout_set(void *data, u64 val)
                return -EINVAL;
 
        hci_dev_lock(hdev);
-       hdev->idle_timeout= val;
+       hdev->idle_timeout = val;
        hci_dev_unlock(hdev);
 
        return 0;
@@ -453,7 +451,7 @@ static int sniff_min_interval_set(void *data, u64 val)
                return -EINVAL;
 
        hci_dev_lock(hdev);
-       hdev->sniff_min_interval= val;
+       hdev->sniff_min_interval = val;
        hci_dev_unlock(hdev);
 
        return 0;
@@ -481,7 +479,7 @@ static int sniff_max_interval_set(void *data, u64 val)
                return -EINVAL;
 
        hci_dev_lock(hdev);
-       hdev->sniff_max_interval= val;
+       hdev->sniff_max_interval = val;
        hci_dev_unlock(hdev);
 
        return 0;
@@ -590,7 +588,7 @@ static int conn_min_interval_set(void *data, u64 val)
                return -EINVAL;
 
        hci_dev_lock(hdev);
-       hdev->le_conn_min_interval= val;
+       hdev->le_conn_min_interval = val;
        hci_dev_unlock(hdev);
 
        return 0;
@@ -618,7 +616,7 @@ static int conn_max_interval_set(void *data, u64 val)
                return -EINVAL;
 
        hci_dev_lock(hdev);
-       hdev->le_conn_max_interval= val;
+       hdev->le_conn_max_interval = val;
        hci_dev_unlock(hdev);
 
        return 0;