From: Rusty Russell <rusty@rustcorp.com.au>
Date: Mon, 15 Jul 2013 01:54:08 +0000 (+0930)
Subject: staging/zcache: don't use PTR_RET().
X-Git-Tag: firefly_0821_release~176^2~5434^2~7
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8a1d41cfeaf59a07acc7b1b3620ad6aa5cf47dc2;p=firefly-linux-kernel-4.4.55.git

staging/zcache: don't use PTR_RET().

We've already tested that it's an error.

Cc: Dan Magenheimer <dan.magenheimer@oracle.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---

diff --git a/drivers/staging/zcache/zcache-main.c b/drivers/staging/zcache/zcache-main.c
index dcceed29d31a..88e7fe7fe183 100644
--- a/drivers/staging/zcache/zcache-main.c
+++ b/drivers/staging/zcache/zcache-main.c
@@ -1908,7 +1908,7 @@ static int zcache_init(void)
 #endif
 		if (IS_ERR(old_ops) || old_ops) {
 			if (IS_ERR(old_ops))
-				return PTR_RET(old_ops);
+				return PTR_ERR(old_ops);
 			pr_warn("%s: frontswap_ops overridden\n", namestr);
 		}
 	}