Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / mfd / tps6507x.c

diff --git a/drivers/mfd/tps6507x.c b/drivers/mfd/tps6507x.c
index d859dffed39f009d8b68c6a069d8f589341a36c2..33ba7723c967435b67c49a6f3f78212a63204b4e 100644 (file)
--- a/drivers/mfd/tps6507x.c
+++ b/drivers/mfd/tps6507x.c
@@ -68,7 +68,7 @@ static int tps6507x_i2c_write_device(struct tps6507x_dev *tps6507x, char reg,
        u8 msg[TPS6507X_MAX_REGISTER + 1];
        int ret;
 
-       if (bytes > (TPS6507X_MAX_REGISTER + 1))
+       if (bytes > TPS6507X_MAX_REGISTER)
                return -EINVAL;
 
        msg[0] = reg;
@@ -89,10 +89,8 @@ static int tps6507x_i2c_probe(struct i2c_client *i2c,
        int ret = 0;
 
        tps6507x = kzalloc(sizeof(struct tps6507x_dev), GFP_KERNEL);
-       if (tps6507x == NULL) {
-               kfree(i2c);
+       if (tps6507x == NULL)
                return -ENOMEM;
-       }
 
        i2c_set_clientdata(i2c, tps6507x);
        tps6507x->dev = &i2c->dev;