]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
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>
Wed, 24 Jul 2013 02:31:35 +0000 (19:31 -0700)
commitdab9bf41b23fe700c4a74133e41eb6a21706031e
tree652729611132f5cbf25e40e43da9ec08864edde6
parent99f22c4ef24cf87b0dae6aabe6b5e620b62961d9
mei: me: fix waiting for hw ready

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