Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Minor overlapping changes in the btusb and ixgbe drivers.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/gpu/drm/lima/lima_gem.c b/drivers/gpu/drm/lima/lima_gem.c
index 477c0f766663..b609dc030d6c 100644
--- a/drivers/gpu/drm/lima/lima_gem.c
+++ b/drivers/gpu/drm/lima/lima_gem.c
@@ -342,7 +342,7 @@ int lima_gem_wait(struct drm_file *file, u32 handle, u32 op, s64 timeout_ns)
         timeout = drm_timeout_abs_to_jiffies(timeout_ns);
 
         ret = drm_gem_reservation_object_wait(file, handle, write, timeout);
-        if (ret == 0)
+        if (ret == -ETIME)
                 ret = timeout ? -ETIMEDOUT : -EBUSY;
 
         return ret;