Commit 880d010c authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-6.15/lenovo' into for-linus 

- code cleanups (Dan Carpenter, Vishnu Sankar)
parents 071b38ee 608446c2

drivers/hid/hid-lenovo.c

+3 −5
Original line number Diff line number Diff line
@@ -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;

		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;

}