netfilter: nf_ct_ext: support variable length extensions

[mirror_ubuntu-zesty-kernel.git] / net / bluetooth / hci_sysfs.c

diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c
index bc154298979a8278efa4611309e025d663f056bc..937f3187eafa51bbb540db6352535cfb4a30485e 100644 (file)
--- a/net/bluetooth/hci_sysfs.c
+++ b/net/bluetooth/hci_sysfs.c
@@ -444,8 +444,8 @@ static const struct file_operations blacklist_fops = {
 
 static void print_bt_uuid(struct seq_file *f, u8 *uuid)
 {
-       u32 data0, data4;
-       u16 data1, data2, data3, data5;
+       __be32 data0, data4;
+       __be16 data1, data2, data3, data5;
 
        memcpy(&data0, &uuid[0], 4);
        memcpy(&data1, &uuid[4], 2);
@@ -533,7 +533,6 @@ int hci_add_sysfs(struct hci_dev *hdev)
 
        BT_DBG("%p name %s bus %d", hdev, hdev->name, hdev->bus);
 
-       dev->parent = hdev->parent;
        dev_set_name(dev, "%s", hdev->name);
 
        err = device_add(dev);