diff options
| author | Jiri Kosina <jkosina@suse.com> | 2025-03-26 15:52:27 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.com> | 2025-03-26 15:52:27 +0300 |
| commit | 880d010ca55ffa15794a30cbd6f121dcebee55e7 (patch) | |
| tree | f1ed61a6e03cc9fdaf9e85506e1f1814c61dc431 | |
| parent | 071b38ee0975f468625883ed068bda69004772f2 (diff) | |
| parent | 608446c238079d6c2390c05026a6670ca5334f01 (diff) | |
| download | linux-880d010ca55ffa15794a30cbd6f121dcebee55e7.tar.xz | |
Merge branch 'for-6.15/lenovo' into for-linus
- code cleanups (Dan Carpenter, Vishnu Sankar)
| -rw-r--r-- | drivers/hid/hid-lenovo.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/hid/hid-lenovo.c b/drivers/hid/hid-lenovo.c index a7d9ca02779e..af29ba840522 100644 --- a/drivers/hid/hid-lenovo.c +++ b/drivers/hid/hid-lenovo.c @@ -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; } |