Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ca22be0 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "Bluetooth: hci_core: Fix build warnings" 



This reverts commit b48595f5 which is
commit dcda165706b9fbfd685898d46a6749d7d397e0c0 upstream.

It breaks the android ABI and if this is needed in the future, can be
brought back in an abi-safe way.

Bug: 161946584
Change-Id: I4a64dca20bcdfe9cbe33fc23c7d3d1b252f4b873
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent cf5d98b2

include/net/bluetooth/hci_core.h

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ struct hci_dev { 
	struct list_head list;

	struct mutex	lock;



	const char	*name;

	char		name[8];

	unsigned long	flags;

	__u16		id;

	__u8		bus;

net/bluetooth/hci_core.c

+3 −5
Original line number Diff line number Diff line
@@ -3317,11 +3317,7 @@ int hci_register_dev(struct hci_dev *hdev) 
	if (id < 0)

		return id;



	error = dev_set_name(&hdev->dev, "hci%u", id);

	if (error)

		return error;



	hdev->name = dev_name(&hdev->dev);

	snprintf(hdev->name, sizeof(hdev->name), "hci%d", id);

	hdev->id = id;



	BT_DBG("%p name %s bus %d", hdev, hdev->name, hdev->bus);
@@ -3343,6 +3339,8 @@ int hci_register_dev(struct hci_dev *hdev) 
	if (!IS_ERR_OR_NULL(bt_debugfs))

		hdev->debugfs = debugfs_create_dir(hdev->name, bt_debugfs);



	dev_set_name(&hdev->dev, "%s", hdev->name);



	error = device_add(&hdev->dev);

	if (error < 0)

		goto err_wqueue;