Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec

[linux-2.6-microblaze.git] / drivers / memory / renesas-rpc-if.c

diff --git a/drivers/memory/renesas-rpc-if.c b/drivers/memory/renesas-rpc-if.c
index 88f51ec..f2a33a1 100644 (file)
--- a/drivers/memory/renesas-rpc-if.c
+++ b/drivers/memory/renesas-rpc-if.c
@@ -199,10 +199,8 @@ int rpcif_sw_init(struct rpcif *rpc, struct device *dev)
                rpc->dirmap = NULL;
 
        rpc->rstc = devm_reset_control_get_exclusive(&pdev->dev, NULL);
-       if (IS_ERR(rpc->rstc))
-               return PTR_ERR(rpc->rstc);
 
-       return 0;
+       return PTR_ERR_OR_ZERO(rpc->rstc);
 }
 EXPORT_SYMBOL(rpcif_sw_init);