diff --git a/[refs] b/[refs] index 8dee68b30494..b30f06a0d67d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb1dc0bacb8ddd7ba6a5906c678a5a5a110cf695 +refs/heads/master: 57119c34e53bbb8d244c3ff1335ef5145768538f diff --git a/trunk/lib/ratelimit.c b/trunk/lib/ratelimit.c index b4cd24ff9b29..027a03f4c56d 100644 --- a/trunk/lib/ratelimit.c +++ b/trunk/lib/ratelimit.c @@ -40,7 +40,7 @@ int ___ratelimit(struct ratelimit_state *rs, const char *func) * the entity that is holding the lock already: */ if (!spin_trylock_irqsave(&rs->lock, flags)) - return 1; + return 0; if (!rs->begin) rs->begin = jiffies;