|
@@ -436,27 +436,37 @@ static int logi_dj_recv_send_report(struct dj_receiver_dev *djrcv_dev,
|
|
|
|
|
|
static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev)
|
|
static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev)
|
|
{
|
|
{
|
|
- struct dj_report dj_report;
|
|
|
|
|
|
+ struct dj_report *dj_report;
|
|
|
|
+ int retval;
|
|
|
|
|
|
- memset(&dj_report, 0, sizeof(dj_report));
|
|
|
|
- dj_report.report_id = REPORT_ID_DJ_SHORT;
|
|
|
|
- dj_report.device_index = 0xFF;
|
|
|
|
- dj_report.report_type = REPORT_TYPE_CMD_GET_PAIRED_DEVICES;
|
|
|
|
- return logi_dj_recv_send_report(djrcv_dev, &dj_report);
|
|
|
|
|
|
+ dj_report = kzalloc(sizeof(dj_report), GFP_KERNEL);
|
|
|
|
+ if (!dj_report)
|
|
|
|
+ return -ENOMEM;
|
|
|
|
+ dj_report->report_id = REPORT_ID_DJ_SHORT;
|
|
|
|
+ dj_report->device_index = 0xFF;
|
|
|
|
+ dj_report->report_type = REPORT_TYPE_CMD_GET_PAIRED_DEVICES;
|
|
|
|
+ retval = logi_dj_recv_send_report(djrcv_dev, dj_report);
|
|
|
|
+ kfree(dj_report);
|
|
|
|
+ return retval;
|
|
}
|
|
}
|
|
|
|
|
|
static int logi_dj_recv_switch_to_dj_mode(struct dj_receiver_dev *djrcv_dev,
|
|
static int logi_dj_recv_switch_to_dj_mode(struct dj_receiver_dev *djrcv_dev,
|
|
unsigned timeout)
|
|
unsigned timeout)
|
|
{
|
|
{
|
|
- struct dj_report dj_report;
|
|
|
|
|
|
+ struct dj_report *dj_report;
|
|
|
|
+ int retval;
|
|
|
|
|
|
- memset(&dj_report, 0, sizeof(dj_report));
|
|
|
|
- dj_report.report_id = REPORT_ID_DJ_SHORT;
|
|
|
|
- dj_report.device_index = 0xFF;
|
|
|
|
- dj_report.report_type = REPORT_TYPE_CMD_SWITCH;
|
|
|
|
- dj_report.report_params[CMD_SWITCH_PARAM_DEVBITFIELD] = 0x3F;
|
|
|
|
- dj_report.report_params[CMD_SWITCH_PARAM_TIMEOUT_SECONDS] = (u8)timeout;
|
|
|
|
- return logi_dj_recv_send_report(djrcv_dev, &dj_report);
|
|
|
|
|
|
+ dj_report = kzalloc(sizeof(dj_report), GFP_KERNEL);
|
|
|
|
+ if (!dj_report)
|
|
|
|
+ return -ENOMEM;
|
|
|
|
+ dj_report->report_id = REPORT_ID_DJ_SHORT;
|
|
|
|
+ dj_report->device_index = 0xFF;
|
|
|
|
+ dj_report->report_type = REPORT_TYPE_CMD_SWITCH;
|
|
|
|
+ dj_report->report_params[CMD_SWITCH_PARAM_DEVBITFIELD] = 0x3F;
|
|
|
|
+ dj_report->report_params[CMD_SWITCH_PARAM_TIMEOUT_SECONDS] = (u8)timeout;
|
|
|
|
+ retval = logi_dj_recv_send_report(djrcv_dev, dj_report);
|
|
|
|
+ kfree(dj_report);
|
|
|
|
+ return retval;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|