diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2013-05-02 07:29:43 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-05-21 06:52:15 -0400 |
commit | c02b211df6fc54e51ee554c27a6736a11255a764 (patch) | |
tree | a2b78b3a7a0400550fdd89da110d1b21a9e1acb1 /drivers/media/i2c/vp27smpx.c | |
parent | 95323361e5313733a54771c5059f5b352adbf32c (diff) |
[media] media: i2c: Convert to devm_kzalloc()
Using the managed function the kfree() calls can be removed from the
probe error path and the remove handler.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/i2c/vp27smpx.c')
-rw-r--r-- | drivers/media/i2c/vp27smpx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/i2c/vp27smpx.c b/drivers/media/i2c/vp27smpx.c index e71f139695af..208a095d7bcc 100644 --- a/drivers/media/i2c/vp27smpx.c +++ b/drivers/media/i2c/vp27smpx.c | |||
@@ -169,7 +169,7 @@ static int vp27smpx_probe(struct i2c_client *client, | |||
169 | v4l_info(client, "chip found @ 0x%x (%s)\n", | 169 | v4l_info(client, "chip found @ 0x%x (%s)\n", |
170 | client->addr << 1, client->adapter->name); | 170 | client->addr << 1, client->adapter->name); |
171 | 171 | ||
172 | state = kzalloc(sizeof(struct vp27smpx_state), GFP_KERNEL); | 172 | state = devm_kzalloc(&client->dev, sizeof(*state), GFP_KERNEL); |
173 | if (state == NULL) | 173 | if (state == NULL) |
174 | return -ENOMEM; | 174 | return -ENOMEM; |
175 | sd = &state->sd; | 175 | sd = &state->sd; |
@@ -186,7 +186,6 @@ static int vp27smpx_remove(struct i2c_client *client) | |||
186 | struct v4l2_subdev *sd = i2c_get_clientdata(client); | 186 | struct v4l2_subdev *sd = i2c_get_clientdata(client); |
187 | 187 | ||
188 | v4l2_device_unregister_subdev(sd); | 188 | v4l2_device_unregister_subdev(sd); |
189 | kfree(to_state(sd)); | ||
190 | return 0; | 189 | return 0; |
191 | } | 190 | } |
192 | 191 | ||