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

Commit 096ff6ec authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "HID: core: store the unique system identifier in hid_device" 



This reverts commit 2c8f7961 which is
commit 1e839143d674603b0bbbc4c513bca35404967dbc upstream.

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

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

drivers/hid/hid-core.c

+1 −3
Original line number Diff line number Diff line
@@ -2441,12 +2441,10 @@ int hid_add_device(struct hid_device *hdev) 
			hid_warn(hdev, "bad device descriptor (%d)\n", ret);

	}



	hdev->id = atomic_inc_return(&id);



	/* XXX hack, any other cleaner solution after the driver core

	 * is converted to allow more than 20 bytes as the device name? */

	dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,

		     hdev->vendor, hdev->product, hdev->id);

		     hdev->vendor, hdev->product, atomic_inc_return(&id));



	hid_debug_register(hdev, dev_name(&hdev->dev));

	ret = device_add(&hdev->dev);

include/linux/hid.h

+0 −2
Original line number Diff line number Diff line
@@ -624,8 +624,6 @@ struct hid_device { /* device report descriptor */ 
	spinlock_t  debug_list_lock;

	wait_queue_head_t debug_wait;



	unsigned int id;						/* system unique id */



	ANDROID_KABI_RESERVE(1);

	ANDROID_KABI_RESERVE(2);

};