Skip to content

Commit 880d010

Browse files
author
Jiri Kosina
committed
Merge branch 'for-6.15/lenovo' into for-linus
- code cleanups (Dan Carpenter, Vishnu Sankar)
2 parents 071b38e + 608446c commit 880d010

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

drivers/hid/hid-lenovo.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -728,11 +728,9 @@ static int lenovo_raw_event_TP_X12_tab(struct hid_device *hdev, u32 raw_data)
728728
if (hdev->product == USB_DEVICE_ID_LENOVO_X12_TAB) {
729729
report_key_event(input, KEY_RFKILL);
730730
return 1;
731-
} else {
732-
platform_profile_cycle();
733-
return 1;
734731
}
735-
return 0;
732+
platform_profile_cycle();
733+
return 1;
736734
case TP_X12_RAW_HOTKEY_FN_F10:
737735
/* TAB1 has PICKUP Phone and TAB2 use Snipping tool*/
738736
(hdev->product == USB_DEVICE_ID_LENOVO_X12_TAB) ?
@@ -778,7 +776,7 @@ static int lenovo_raw_event(struct hid_device *hdev,
778776
if (unlikely((hdev->product == USB_DEVICE_ID_LENOVO_X12_TAB
779777
|| hdev->product == USB_DEVICE_ID_LENOVO_X12_TAB2)
780778
&& size >= 3 && report->id == 0x03))
781-
return lenovo_raw_event_TP_X12_tab(hdev, le32_to_cpu(*(u32 *)data));
779+
return lenovo_raw_event_TP_X12_tab(hdev, le32_to_cpu(*(__le32 *)data));
782780

783781
return 0;
784782
}

0 commit comments

Comments
 (0)