Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 206ecfc2 authored by Frode Isaksen's avatar Frode Isaksen Committed by Greg Kroah-Hartman
Browse files

mei: mei_cl_connect: don't multiply the timeout twice 



MEI_CL_CONNECT_TIMEOUT is the timeout in seconds to wait
for a response in mei_cl_connect.
The value was converted to jiffies using mei_secs_to_jiffies
helper function and assigned to a local variable
which is by mistake again multiplied by HZ

Signed-off-by: default avatarFrode Isaksen <frodex.isaksen@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4dfaa9f7

drivers/misc/mei/client.c

+1 −2
Original line number Diff line number Diff line
@@ -485,7 +485,6 @@ int mei_cl_connect(struct mei_cl *cl, struct file *file) 
{

	struct mei_device *dev;

	struct mei_cl_cb *cb;

	long timeout = mei_secs_to_jiffies(MEI_CL_CONNECT_TIMEOUT);

	int rets;



	if (WARN_ON(!cl || !cl->dev))
@@ -518,7 +517,7 @@ int mei_cl_connect(struct mei_cl *cl, struct file *file) 
	rets = wait_event_timeout(dev->wait_recvd_msg,

				 (cl->state == MEI_FILE_CONNECTED ||

				  cl->state == MEI_FILE_DISCONNECTED),

				 timeout * HZ);

				 mei_secs_to_jiffies(MEI_CL_CONNECT_TIMEOUT));

	mutex_lock(&dev->device_lock);



	if (cl->state != MEI_FILE_CONNECTED) {