| Message ID | 20210321141049.148-8-alistair@alistair23.me (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add Wacom I2C support to rM2 | expand |
On Sun, Mar 21, 2021 at 10:10:47AM -0400, Alistair Francis wrote: > Add support for a VDD regulator. This allows the kernel to prove the > Wacom-I2C device on the rM2. > > Signed-off-by: Alistair Francis <alistair@alistair23.me> > --- > drivers/input/touchscreen/wacom_i2c.c | 22 ++++++++++++++++++++++ > 1 file changed, 22 insertions(+) > > diff --git a/drivers/input/touchscreen/wacom_i2c.c b/drivers/input/touchscreen/wacom_i2c.c > index 7aa0d1c3dbc9..00db516fa3de 100644 > --- a/drivers/input/touchscreen/wacom_i2c.c > +++ b/drivers/input/touchscreen/wacom_i2c.c > @@ -13,6 +13,7 @@ > #include <linux/irq.h> > #include <linux/input/touchscreen.h> > #include <linux/interrupt.h> > +#include <linux/regulator/consumer.h> > #include <linux/reset.h> > #include <linux/of.h> > #include <asm/unaligned.h> > @@ -56,6 +57,7 @@ struct wacom_i2c { > struct i2c_client *client; > struct input_dev *input; > struct touchscreen_properties props; > + struct regulator *vdd; > u8 data[WACOM_QUERY_SIZE]; > bool prox; > int tool; > @@ -203,11 +205,29 @@ static int wacom_i2c_probe(struct i2c_client *client, > struct wacom_features features = { 0 }; > int error; > > + wac_i2c = kzalloc(sizeof(*wac_i2c), GFP_KERNEL); > + if (!wac_i2c) > + return -ENOMEM; > + > if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) { > dev_err(&client->dev, "i2c_check_functionality error\n"); > return -EIO; You are leaking memory here. Additionally, I do not see you removing the original allocation below, so I think you end up with 2 instances of structure wacom_i2c. Thanks.
diff --git a/drivers/input/touchscreen/wacom_i2c.c b/drivers/input/touchscreen/wacom_i2c.c index 7aa0d1c3dbc9..00db516fa3de 100644 --- a/drivers/input/touchscreen/wacom_i2c.c +++ b/drivers/input/touchscreen/wacom_i2c.c @@ -13,6 +13,7 @@ #include <linux/irq.h> #include <linux/input/touchscreen.h> #include <linux/interrupt.h> +#include <linux/regulator/consumer.h> #include <linux/reset.h> #include <linux/of.h> #include <asm/unaligned.h> @@ -56,6 +57,7 @@ struct wacom_i2c { struct i2c_client *client; struct input_dev *input; struct touchscreen_properties props; + struct regulator *vdd; u8 data[WACOM_QUERY_SIZE]; bool prox; int tool; @@ -203,11 +205,29 @@ static int wacom_i2c_probe(struct i2c_client *client, struct wacom_features features = { 0 }; int error; + wac_i2c = kzalloc(sizeof(*wac_i2c), GFP_KERNEL); + if (!wac_i2c) + return -ENOMEM; + if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) { dev_err(&client->dev, "i2c_check_functionality error\n"); return -EIO; } + wac_i2c->vdd = regulator_get(&client->dev, "vdd"); + if (IS_ERR(wac_i2c->vdd)) { + error = PTR_ERR(wac_i2c->vdd); + kfree(wac_i2c); + return error; + } + + error = regulator_enable(wac_i2c->vdd); + if (error) { + regulator_put(wac_i2c->vdd); + kfree(wac_i2c); + return error; + } + error = wacom_query_device(client, &features); if (error) return error; @@ -275,6 +295,8 @@ static int wacom_i2c_probe(struct i2c_client *client, err_free_irq: free_irq(client->irq, wac_i2c); err_free_mem: + regulator_disable(wac_i2c->vdd); + regulator_put(wac_i2c->vdd); input_free_device(input); kfree(wac_i2c);
Add support for a VDD regulator. This allows the kernel to prove the Wacom-I2C device on the rM2. Signed-off-by: Alistair Francis <alistair@alistair23.me> --- drivers/input/touchscreen/wacom_i2c.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)