Commit ca389a55 authored by Hans de Goede's avatar Hans de Goede Committed by Jiri Kosina
Browse files

HID: logitech-dj: Remove duplicate error logging 



logi_dj_recv_query_paired_devices() and logi_dj_recv_switch_to_dj_mode()
both have 2 callers which all log an error if the function fails. Move
the error logging to inside these 2 functions to remove the duplicated
error logging in the callers.

While at it also move the logi_dj_recv_send_report() call error handling
in logi_dj_recv_switch_to_dj_mode() to directly after the call. That call
only fails if the report cannot be found and in that case it does nothing,
so the msleep() is not necessary on failures.

Fixes: 6f20d326 ("HID: logitech-dj: Fix error handling in logi_dj_recv_switch_to_dj_mode()")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarHans de Goede <johannes.goede@oss.qualcomm.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.com>
parent a78eb69d

drivers/hid/hid-logitech-dj.c

+23 −33
Original line number Diff line number Diff line
@@ -805,7 +805,6 @@ static void delayedwork_callback(struct work_struct *work) 
	struct dj_workitem workitem;

	unsigned long flags;

	int count;

	int retval;



	dbg_hid("%s\n", __func__);
@@ -842,11 +841,7 @@ static void delayedwork_callback(struct work_struct *work) 
		logi_dj_recv_destroy_djhid_device(djrcv_dev, &workitem);

		break;

	case WORKITEM_TYPE_UNKNOWN:

		retval = logi_dj_recv_query_paired_devices(djrcv_dev);

		if (retval) {

			hid_err(djrcv_dev->hidpp, "%s: logi_dj_recv_query_paired_devices error: %d\n",

				__func__, retval);

		}

		logi_dj_recv_query_paired_devices(djrcv_dev);

		break;

	case WORKITEM_TYPE_EMPTY:

		dbg_hid("%s: device list is empty\n", __func__);
@@ -1239,8 +1234,10 @@ static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev) 


	djrcv_dev->last_query = jiffies;



	if (djrcv_dev->type != recvr_type_dj)

		return logi_dj_recv_query_hidpp_devices(djrcv_dev);

	if (djrcv_dev->type != recvr_type_dj) {

		retval = logi_dj_recv_query_hidpp_devices(djrcv_dev);

		goto out;

	}



	dj_report = kzalloc(sizeof(struct dj_report), GFP_KERNEL);

	if (!dj_report)
@@ -1250,6 +1247,10 @@ static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev) 
	dj_report->report_type = REPORT_TYPE_CMD_GET_PAIRED_DEVICES;

	retval = logi_dj_recv_send_report(djrcv_dev, dj_report);

	kfree(dj_report);

out:

	if (retval < 0)

		hid_err(djrcv_dev->hidpp, "%s error:%d\n", __func__, retval);



	return retval;

}
@@ -1275,6 +1276,8 @@ static int logi_dj_recv_switch_to_dj_mode(struct dj_receiver_dev *djrcv_dev, 
								(u8)timeout;



		retval = logi_dj_recv_send_report(djrcv_dev, dj_report);

		if (retval)

			goto out;



		/*

		 * Ugly sleep to work around a USB 3.0 bug when the receiver is
@@ -1283,11 +1286,6 @@ static int logi_dj_recv_switch_to_dj_mode(struct dj_receiver_dev *djrcv_dev, 
		 * 50 msec should gives enough time to the receiver to be ready.

		 */

		msleep(50);



		if (retval) {

			kfree(dj_report);

			return retval;

		}

	}



	/*
@@ -1313,7 +1311,12 @@ static int logi_dj_recv_switch_to_dj_mode(struct dj_receiver_dev *djrcv_dev, 
			HIDPP_REPORT_SHORT_LENGTH, HID_OUTPUT_REPORT,

			HID_REQ_SET_REPORT);



out:

	kfree(dj_report);



	if (retval < 0)

		hid_err(hdev, "%s error:%d\n", __func__, retval);



	return retval;

}
@@ -1835,12 +1838,9 @@ static int logi_dj_probe(struct hid_device *hdev, 


	if (has_hidpp) {

		retval = logi_dj_recv_switch_to_dj_mode(djrcv_dev, 0);

		if (retval < 0) {

			hid_err(hdev, "%s: logi_dj_recv_switch_to_dj_mode returned error:%d\n",

				__func__, retval);

		if (retval < 0)

			goto switch_to_dj_mode_fail;

	}

	}



	/* This is enabling the polling urb on the IN endpoint */

	retval = hid_hw_open(hdev);
@@ -1857,15 +1857,11 @@ static int logi_dj_probe(struct hid_device *hdev, 
		spin_lock_irqsave(&djrcv_dev->lock, flags);

		djrcv_dev->ready = true;

		spin_unlock_irqrestore(&djrcv_dev->lock, flags);

		retval = logi_dj_recv_query_paired_devices(djrcv_dev);

		if (retval < 0) {

			hid_err(hdev, "%s: logi_dj_recv_query_paired_devices error:%d\n",

				__func__, retval);

		/*

			 * This can happen with a KVM, let the probe succeed,

			 * logi_dj_recv_queue_unknown_work will retry later.

		 * This can fail with a KVM. Ignore errors to let the probe

		 * succeed, logi_dj_recv_queue_unknown_work will retry later.

		 */

		}

		logi_dj_recv_query_paired_devices(djrcv_dev);

	}



	return 0;
@@ -1882,18 +1878,12 @@ static int logi_dj_probe(struct hid_device *hdev, 
#ifdef CONFIG_PM

static int logi_dj_reset_resume(struct hid_device *hdev)

{

	int retval;

	struct dj_receiver_dev *djrcv_dev = hid_get_drvdata(hdev);



	if (!djrcv_dev || djrcv_dev->hidpp != hdev)

		return 0;



	retval = logi_dj_recv_switch_to_dj_mode(djrcv_dev, 0);

	if (retval < 0) {

		hid_err(hdev, "%s: logi_dj_recv_switch_to_dj_mode returned error:%d\n",

			__func__, retval);

	}



	logi_dj_recv_switch_to_dj_mode(djrcv_dev, 0);

	return 0;

}

#endif