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

Commit 9462550f authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] mt9v032: Free control handler in cleanup paths 



The control handler must be freed in the probe error path and in the
remove handler.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 2660a22b

drivers/media/i2c/mt9v032.c

+6 −1
Original line number Diff line number Diff line
@@ -830,8 +830,11 @@ static int mt9v032_probe(struct i2c_client *client, 


	mt9v032->pad.flags = MEDIA_PAD_FL_SOURCE;

	ret = media_entity_init(&mt9v032->subdev.entity, 1, &mt9v032->pad, 0);

	if (ret < 0)



	if (ret < 0) {

		v4l2_ctrl_handler_free(&mt9v032->ctrls);

		kfree(mt9v032);

	}



	return ret;

}
@@ -841,9 +844,11 @@ static int mt9v032_remove(struct i2c_client *client) 
	struct v4l2_subdev *subdev = i2c_get_clientdata(client);

	struct mt9v032 *mt9v032 = to_mt9v032(subdev);



	v4l2_ctrl_handler_free(&mt9v032->ctrls);

	v4l2_device_unregister_subdev(subdev);

	media_entity_cleanup(&subdev->entity);

	kfree(mt9v032);



	return 0;

}