Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...

[cascardo/linux.git] / drivers / video / fbdev / mb862xx / mb862xx-i2c.c

diff --git a/drivers/video/fbdev/mb862xx/mb862xx-i2c.c b/drivers/video/fbdev/mb862xx/mb862xx-i2c.c
index c87e17a..ba96c44 100644 (file)
--- a/drivers/video/fbdev/mb862xx/mb862xx-i2c.c
+++ b/drivers/video/fbdev/mb862xx/mb862xx-i2c.c
@@ -157,17 +157,10 @@ static struct i2c_adapter mb862xx_i2c_adapter = {
 
 int mb862xx_i2c_init(struct mb862xxfb_par *par)
 {
-       int ret;
-
        mb862xx_i2c_adapter.algo_data = par;
        par->adap = &mb862xx_i2c_adapter;
 
-       ret = i2c_add_adapter(par->adap);
-       if (ret < 0) {
-               dev_err(par->dev, "failed to add %s\n",
-                       mb862xx_i2c_adapter.name);
-       }
-       return ret;
+       return i2c_add_adapter(par->adap);
 }
 
 void mb862xx_i2c_exit(struct mb862xxfb_par *par)