1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/i2c/algos/i2c-algo-pca.c b/drivers/i2c/algos/i2c-algo-pca.c
index 82946acab4c7..9081c9fbcd29 100644
--- a/drivers/i2c/algos/i2c-algo-pca.c
+++ b/drivers/i2c/algos/i2c-algo-pca.c
@@ -355,7 +355,7 @@ static int pca_init(struct i2c_algo_pca_data *adap)
         return 0;
 }
 
-static struct i2c_algorithm pca_algo = {
+static const struct i2c_algorithm pca_algo = {
         .master_xfer    = pca_xfer,
         .functionality  = pca_func,
 };
@@ -374,10 +374,10 @@ int i2c_pca_add_bus(struct i2c_adapter *adap)
         adap->timeout = 100;            /* default values, should       */
         adap->retries = 3;              /* be replaced by defines       */
 
-        rval = pca_init(pca_adap);
+        if ((rval = pca_init(pca_adap)))
+                return rval;
 
-        if (!rval)
-                i2c_add_adapter(adap);
+        rval = i2c_add_adapter(adap);
 
         return rval;
 }