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

Commit 66fe66bf authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa: rm: fix memory allocation flags"

parents e952050a 1d9d3d7c

drivers/platform/msm/ipa/ipa_rm.c

+1 −1
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ int ipa_rm_wq_send_cmd(enum ipa_rm_wq_cmd wq_cmd, 
		bool notify_registered_only)

{

	int result = -ENOMEM;

	struct ipa_rm_wq_work_type *work = kzalloc(sizeof(*work), GFP_KERNEL);

	struct ipa_rm_wq_work_type *work = kzalloc(sizeof(*work), GFP_ATOMIC);

	if (work) {

		INIT_WORK((struct work_struct *)work, ipa_rm_wq_handler);

		work->wq_cmd = wq_cmd;

drivers/platform/msm/ipa/ipa_rm_peers_list.c

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ int ipa_rm_peers_list_create(int max_peers, 
{

	int result;



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

	*peers_list = kzalloc(sizeof(**peers_list), GFP_ATOMIC);

	if (!*peers_list) {

		IPA_RM_ERR("no mem\n");

		result = -ENOMEM;
@@ -70,7 +70,7 @@ int ipa_rm_peers_list_create(int max_peers, 


	(*peers_list)->max_peers = max_peers;

	(*peers_list)->peers = kzalloc((*peers_list)->max_peers *

				sizeof(struct ipa_rm_resource *), GFP_KERNEL);

				sizeof(struct ipa_rm_resource *), GFP_ATOMIC);

	if (!((*peers_list)->peers)) {

		IPA_RM_ERR("no mem\n");

		result = -ENOMEM;

drivers/platform/msm/ipa/ipa_rm_resource.c

+3 −3
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ static int ipa_rm_resource_producer_create(struct ipa_rm_resource **resource, 
{

	int result = 0;



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

	*producer = kzalloc(sizeof(**producer), GFP_ATOMIC);

	if (*producer == NULL) {

		IPA_RM_ERR("no mem\n");

		result = -ENOMEM;
@@ -265,7 +265,7 @@ static int ipa_rm_resource_consumer_create(struct ipa_rm_resource **resource, 
{

	int result = 0;



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

	*consumer = kzalloc(sizeof(**consumer), GFP_ATOMIC);

	if (*consumer == NULL) {

		IPA_RM_ERR("no mem\n");

		result = -ENOMEM;
@@ -446,7 +446,7 @@ int ipa_rm_resource_producer_register(struct ipa_rm_resource_prod *producer, 


	}



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

	reg_info = kzalloc(sizeof(*reg_info), GFP_ATOMIC);

	if (reg_info == NULL) {

		IPA_RM_ERR("no mem\n");

		result = -ENOMEM;