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

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

[media] tvp514x: 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 f3e8e4f1

drivers/media/i2c/tvp514x.c

+1 −3
Original line number Diff line number Diff line
@@ -951,7 +951,7 @@ tvp514x_probe(struct i2c_client *client, const struct i2c_device_id *id) 
		return -ENODEV;

	}



	decoder = kzalloc(sizeof(*decoder), GFP_KERNEL);

	decoder = devm_kzalloc(&client->dev, sizeof(*decoder), GFP_KERNEL);

	if (!decoder)

		return -ENOMEM;
@@ -998,7 +998,6 @@ tvp514x_probe(struct i2c_client *client, const struct i2c_device_id *id) 
		int err = decoder->hdl.error;



		v4l2_ctrl_handler_free(&decoder->hdl);

		kfree(decoder);

		return err;

	}

	v4l2_ctrl_handler_setup(&decoder->hdl);
@@ -1023,7 +1022,6 @@ static int tvp514x_remove(struct i2c_client *client) 


	v4l2_device_unregister_subdev(sd);

	v4l2_ctrl_handler_free(&decoder->hdl);

	kfree(decoder);

	return 0;

}

/* TVP5146 Init/Power on Sequence */