From: David S. Miller Date: Sat, 20 Aug 2016 00:14:08 +0000 (-0700) Subject: Merge branch 'mv88e6xxx-fix-wait' X-Git-Tag: v4.9-rc1~14^2~57 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=0ae940c7a7734ed144103d67333e6b26342aa1e6;p=linux-block.git Merge branch 'mv88e6xxx-fix-wait' Andrew Lunn says: ==================== Fix mv88e6xxx wait function The mv88e6xxx wait function can be upset of the system has nots of other things to do and a sleep takes a lot longer than expected. Fix this be using a fixed number of iterations, rather than a fixed walkclock time. Witht that change made, it is possible to consoliate another wait function. A wait actually timing out should not happen and when it does, it means something serious is wrong. Make sure an error is logged, since not all callers will log an error. ==================== Reviewed-by: Vivien Didelot Signed-off-by: David S. Miller --- 0ae940c7a7734ed144103d67333e6b26342aa1e6