Commit 1145c3d5 authored by Benjamin Tissoires's avatar Benjamin Tissoires
Browse files

Merge branch 'for-6.1/rmi' into for-linus 

- compilation warning fix (Jiangshan Yi)
parents 1af52d6b 486da113

drivers/hid/hid-rmi.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -237,8 +237,7 @@ static int rmi_hid_read_block(struct rmi_transport_dev *xport, u16 addr, 




			read_input_count = data->readReport[1];

			read_input_count = data->readReport[1];

			memcpy(buf + bytes_read, &data->readReport[2],

			memcpy(buf + bytes_read, &data->readReport[2],

				read_input_count < bytes_needed ?

				min(read_input_count, bytes_needed));

					read_input_count : bytes_needed);





			bytes_read += read_input_count;

			bytes_read += read_input_count;

			bytes_needed -= read_input_count;

			bytes_needed -= read_input_count;
@@ -347,8 +346,7 @@ static int rmi_read_data_event(struct hid_device *hdev, u8 *data, int size) 
		return 0;

		return 0;

	}

	}





	memcpy(hdata->readReport, data, size < hdata->input_report_size ?

	memcpy(hdata->readReport, data, min((u32)size, hdata->input_report_size));

			size : hdata->input_report_size);

	set_bit(RMI_READ_DATA_PENDING, &hdata->flags);

	set_bit(RMI_READ_DATA_PENDING, &hdata->flags);

	wake_up(&hdata->wait);

	wake_up(&hdata->wait);