Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7a857a0 authored by Lad, Prabhakar's avatar Lad, Prabhakar Committed by Mauro Carvalho Chehab
Browse files

[media] adv7343: use devm_kzalloc() instead of kzalloc() 



I2C drivers can use devm_kzalloc() too in their .probe() methods. Doing so
simplifies their clean up paths.

Signed-off-by: default avatarLad, Prabhakar <prabhakar.lad@ti.com>
Signed-off-by: default avatarManjunath Hadli <manjunath.hadli@ti.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 08754d31

drivers/media/i2c/adv7343.c

+3 −6
Original line number Diff line number Diff line
@@ -397,7 +397,8 @@ static int adv7343_probe(struct i2c_client *client, 
	v4l_info(client, "chip found @ 0x%x (%s)\n",

			client->addr << 1, client->adapter->name);



	state = kzalloc(sizeof(struct adv7343_state), GFP_KERNEL);

	state = devm_kzalloc(&client->dev, sizeof(struct adv7343_state),

			     GFP_KERNEL);

	if (state == NULL)

		return -ENOMEM;
@@ -431,16 +432,13 @@ static int adv7343_probe(struct i2c_client *client, 
		int err = state->hdl.error;



		v4l2_ctrl_handler_free(&state->hdl);

		kfree(state);

		return err;

	}

	v4l2_ctrl_handler_setup(&state->hdl);



	err = adv7343_initialize(&state->sd);

	if (err) {

	if (err)

		v4l2_ctrl_handler_free(&state->hdl);

		kfree(state);

	}

	return err;

}
@@ -451,7 +449,6 @@ static int adv7343_remove(struct i2c_client *client) 


	v4l2_device_unregister_subdev(sd);

	v4l2_ctrl_handler_free(&state->hdl);

	kfree(state);



	return 0;

}