mei: me: fix waiting for hw ready
authorTomas Winkler <tomas.winkler@intel.com>
Wed, 17 Jul 2013 12:13:17 +0000 (15:13 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 29 Aug 2013 16:47:40 +0000 (09:47 -0700)
commit644f5d570740c90439fdf69e8b47647584c6dc2f
treee741ce5e178dcb8721ee1fce4f1661543e6b2f87
parent47e1cf336bc708bb59ebfcc01540dffecd16862e
mei: me: fix waiting for hw ready

commit dab9bf41b23fe700c4a74133e41eb6a21706031e upstream.

1. MEI_INTEROP_TIMEOUT is in seconds not in jiffies
so we use mei_secs_to_jiffies macro
While cold boot is fast this is relevant in resume
2. wait_event_interruptible_timeout can return with
-ERESTARTSYS so do not override it with -ETIMEDOUT
3.Adjust error message

Tested-by: Shuah Khan <shuah.kh@samsung.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/misc/mei/hw-me.c