xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hid-battery' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen into for-linus

Browse Source
This commit is contained in:
Jiri Kosina
2012-01-09 11:24:59 +01:00
parent e027372856 652aa6a9ac
commit 420174afdc
4 changed files with 91 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/linux/hid.h
View File

@@ -495,7 +495,8 @@ struct hid_device { /* device report descriptor */
struct power_supply battery;
__s32 battery_min;
__s32 battery_max;
__s32 battery_val;
__s32 battery_report_type;
__s32 battery_report_id;
#endif
unsigned int status; /* see STAT flags above */
@@ -737,6 +738,8 @@ int hid_parse_report(struct hid_device *hid, __u8 *start, unsigned size);
int hid_check_keys_pressed(struct hid_device *hid);
int hid_connect(struct hid_device *hid, unsigned int connect_mask);
void hid_disconnect(struct hid_device *hid);
const struct hid_device_id *hid_match_id(struct hid_device *hdev,
const struct hid_device_id *id);
/**
* hid_map_usage - map usage input bits