ANDROID: fix up abi break in struct hid_device

In commit bf29fda763 ("HID: retain initial quirks set up when creating
HID devices") a new field is added to struct hid_device in order to
handle quirks properly.  Use the abi-preserved field for this to handle
the ABI change correctly.

Bug: 161946584
Fixes: bf29fda763 ("HID: retain initial quirks set up when creating HID devices")
Change-Id: Icbebf52939ec5da61eef50c53bef5c5fc0e00991
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2023-04-26 07:10:14 +00:00
parent 4f52495a55
commit 49cccf4879

View File

@@ -601,7 +601,6 @@ struct hid_device { /* device report descriptor */
unsigned long status; /* see STAT flags above */
unsigned claimed; /* Claimed by hidinput, hiddev? */
unsigned quirks; /* Various quirks the device can pull on us */
unsigned initial_quirks; /* Initial set of quirks supplied when creating device */
bool io_started; /* If IO has started */
struct list_head inputs; /* The list of inputs */
@@ -633,7 +632,7 @@ struct hid_device { /* device report descriptor */
spinlock_t debug_list_lock;
wait_queue_head_t debug_wait;
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_USE(1, struct { u32 initial_quirks; u32 padding; });
ANDROID_KABI_RESERVE(2);
};