1 files changed, 11 insertions, 12 deletions

diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
index 8b980d371a45..00476e7ee048 100644
--- a/drivers/media/dvb-core/dvbdev.c
+++ b/drivers/media/dvb-core/dvbdev.c
@@ -251,13 +251,13 @@ static int dvb_create_tsout_entity(struct dvb_device *dvbdev,
 {
 	int i;
 
-	dvbdev->tsout_pads = kcalloc(npads, sizeof(*dvbdev->tsout_pads),
-				     GFP_KERNEL);
+	dvbdev->tsout_pads = kzalloc_objs(*dvbdev->tsout_pads, npads,
+					  GFP_KERNEL);
 	if (!dvbdev->tsout_pads)
 		return -ENOMEM;
 
-	dvbdev->tsout_entity = kcalloc(npads, sizeof(*dvbdev->tsout_entity),
-				       GFP_KERNEL);
+	dvbdev->tsout_entity = kzalloc_objs(*dvbdev->tsout_entity, npads,
+					    GFP_KERNEL);
 	if (!dvbdev->tsout_entity)
 		return -ENOMEM;
 
@@ -328,15 +328,14 @@ static int dvb_create_media_entity(struct dvb_device *dvbdev,
 		return 0;
 	}
 
-	dvbdev->entity = kzalloc(sizeof(*dvbdev->entity), GFP_KERNEL);
+	dvbdev->entity = kzalloc_obj(*dvbdev->entity, GFP_KERNEL);
 	if (!dvbdev->entity)
 		return -ENOMEM;
 
 	dvbdev->entity->name = dvbdev->name;
 
 	if (npads) {
-		dvbdev->pads = kcalloc(npads, sizeof(*dvbdev->pads),
-				       GFP_KERNEL);
+		dvbdev->pads = kzalloc_objs(*dvbdev->pads, npads, GFP_KERNEL);
 		if (!dvbdev->pads) {
 			kfree(dvbdev->entity);
 			dvbdev->entity = NULL;
@@ -472,7 +471,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
 		return -ENFILE;
 	}
 
-	*pdvbdev = dvbdev = kzalloc(sizeof(*dvbdev), GFP_KERNEL);
+	*pdvbdev = dvbdev = kzalloc_obj(*dvbdev, GFP_KERNEL);
 	if (!dvbdev) {
 		mutex_unlock(&dvbdev_register_lock);
 		return -ENOMEM;
@@ -500,7 +499,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
 			return -ENOMEM;
 		}
 
-		new_node = kzalloc(sizeof(*new_node), GFP_KERNEL);
+		new_node = kzalloc_obj(*new_node, GFP_KERNEL);
 		if (!new_node) {
 			kfree(dvbdevfops);
 			kfree(dvbdev);
@@ -712,12 +711,12 @@ int dvb_create_media_graph(struct dvb_adapter *adap,
 		demod = NULL;
 
 	if (create_rf_connector) {
-		conn = kzalloc(sizeof(*conn), GFP_KERNEL);
+		conn = kzalloc_obj(*conn, GFP_KERNEL);
 		if (!conn)
 			return -ENOMEM;
 		adap->conn = conn;
 
-		adap->conn_pads = kzalloc(sizeof(*adap->conn_pads), GFP_KERNEL);
+		adap->conn_pads = kzalloc_obj(*adap->conn_pads, GFP_KERNEL);
 		if (!adap->conn_pads)
 			return -ENOMEM;
 
@@ -1027,7 +1026,7 @@ struct i2c_client *dvb_module_probe(const char *module_name,
 	struct i2c_client *client;
 	struct i2c_board_info *board_info;
 
-	board_info = kzalloc(sizeof(*board_info), GFP_KERNEL);
+	board_info = kzalloc_obj(*board_info, GFP_KERNEL);
 	if (!board_info)
 		return NULL;