mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-02-19 17:09:14 -05:00
Merge branch 'for-6.15/lenovo' into for-linus
- code cleanups (Dan Carpenter, Vishnu Sankar)
This commit is contained in:
@@ -728,11 +728,9 @@ static int lenovo_raw_event_TP_X12_tab(struct hid_device *hdev, u32 raw_data)
|
||||
if (hdev->product == USB_DEVICE_ID_LENOVO_X12_TAB) {
|
||||
report_key_event(input, KEY_RFKILL);
|
||||
return 1;
|
||||
} else {
|
||||
platform_profile_cycle();
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
platform_profile_cycle();
|
||||
return 1;
|
||||
case TP_X12_RAW_HOTKEY_FN_F10:
|
||||
/* TAB1 has PICKUP Phone and TAB2 use Snipping tool*/
|
||||
(hdev->product == USB_DEVICE_ID_LENOVO_X12_TAB) ?
|
||||
@@ -778,7 +776,7 @@ static int lenovo_raw_event(struct hid_device *hdev,
|
||||
if (unlikely((hdev->product == USB_DEVICE_ID_LENOVO_X12_TAB
|
||||
|| hdev->product == USB_DEVICE_ID_LENOVO_X12_TAB2)
|
||||
&& size >= 3 && report->id == 0x03))
|
||||
return lenovo_raw_event_TP_X12_tab(hdev, le32_to_cpu(*(u32 *)data));
|
||||
return lenovo_raw_event_TP_X12_tab(hdev, le32_to_cpu(*(__le32 *)data));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user