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: Frode Isaksen <frodex.isaksen@intel.com> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
4dfaa9f702
commit
206ecfc211
|
@ -485,7 +485,6 @@ int mei_cl_connect(struct mei_cl *cl, struct file *file)
|
||||||
{
|
{
|
||||||
struct mei_device *dev;
|
struct mei_device *dev;
|
||||||
struct mei_cl_cb *cb;
|
struct mei_cl_cb *cb;
|
||||||
long timeout = mei_secs_to_jiffies(MEI_CL_CONNECT_TIMEOUT);
|
|
||||||
int rets;
|
int rets;
|
||||||
|
|
||||||
if (WARN_ON(!cl || !cl->dev))
|
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,
|
rets = wait_event_timeout(dev->wait_recvd_msg,
|
||||||
(cl->state == MEI_FILE_CONNECTED ||
|
(cl->state == MEI_FILE_CONNECTED ||
|
||||||
cl->state == MEI_FILE_DISCONNECTED),
|
cl->state == MEI_FILE_DISCONNECTED),
|
||||||
timeout * HZ);
|
mei_secs_to_jiffies(MEI_CL_CONNECT_TIMEOUT));
|
||||||
mutex_lock(&dev->device_lock);
|
mutex_lock(&dev->device_lock);
|
||||||
|
|
||||||
if (cl->state != MEI_FILE_CONNECTED) {
|
if (cl->state != MEI_FILE_CONNECTED) {
|
||||||
|
|
Loading…
Reference in a new issue