Merge tag 'nfs-for-3.10-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[firefly-linux-kernel-4.4.55.git] / drivers / gpio / gpio-max7300.c

diff --git a/drivers/gpio/gpio-max7300.c b/drivers/gpio/gpio-max7300.c
index 4b6b9a04e326609dcc45ed35a95ab82a4ced23c1..40ab6dfb6021be9f82f12e34b5cf048ef6ee72a1 100644 (file)
--- a/drivers/gpio/gpio-max7300.c
+++ b/drivers/gpio/gpio-max7300.c
@@ -41,7 +41,7 @@ static int max7300_probe(struct i2c_client *client,
                        I2C_FUNC_SMBUS_BYTE_DATA))
                return -EIO;
 
-       ts = kzalloc(sizeof(struct max7301), GFP_KERNEL);
+       ts = devm_kzalloc(&client->dev, sizeof(struct max7301), GFP_KERNEL);
        if (!ts)
                return -ENOMEM;
 
@@ -50,8 +50,6 @@ static int max7300_probe(struct i2c_client *client,
        ts->dev = &client->dev;
 
        ret = __max730x_probe(ts);
-       if (ret)
-               kfree(ts);
        return ret;
 }