NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ANDROID: fix up 6.1.60 merge of hid.h into android14-6.1-lts

Browse source 
In commit 59aa39697f ("HID: input: map battery system charging"), the
battery_charge_status field was added, but that had already come into
the branch due to an earlier backport of the same commit, 28ee91ed2b
("UPSTREAM: HID: input: map battery system charging"), and then moved to
a different location in the structure in 8a67c06094 ("ANDROID: GKI:
fix ABI breakage in struct hid_device").

Because of that, we had two copies of the same variable in the same
structure as git didn't know to remove it, so remove it by hand to fix
up the merge and build.

Fixes: 59aa39697f ("HID: input: map battery system charging")
Fixes: 8a67c06094 ("ANDROID: GKI: fix ABI breakage in struct hid_device")
Fixes: 28ee91ed2b ("UPSTREAM: HID: input: map battery system charging")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I89d50f885fd064033fd30609f83193298be45b02
This commit is contained in:
Greg Kroah-Hartman 2023-11-03 16:26:49 +00:00
parent 0a1364ec1f
commit 4933ddb051
1 changed files with 0 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/linux/hid.h
View file

@ -617,7 +617,6 @@ struct hid_device { /* device report descriptor */
__s32 battery_max;
__s32 battery_report_type;
__s32 battery_report_id;
__s32 battery_charge_status;
enum hid_battery_status battery_status;
bool battery_avoid_query;
ktime_t battery_ratelimit_time;