Unverified Commit a1385065 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10489 backport mainline patches 

Merge Pull Request from: @ci-robot 
 
PR sync from: Lin Yujun <linyujun809@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/DLMDANHGQOTISPDIZ43T65Z5QZ2MZYGF/ 
Herve Codina (1):
  irqdomain: Fixed unbalanced fwnode get and put


-- 
2.34.1
 
https://gitee.com/openeuler/kernel/issues/IAF0D0 
 
Link:https://gitee.com/openeuler/kernel/pulls/10489

 

Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents b1e0a9c3 f11c7cf7

kernel/irq/irqdomain.c

+1 −4
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ struct irq_domain *__irq_domain_add(struct fwnode_handle *fwnode, int size, 
		switch (fwid->type) {

		case IRQCHIP_FWNODE_NAMED:

		case IRQCHIP_FWNODE_NAMED_ID:

			domain->fwnode = fwnode;

			domain->name = kstrdup(fwid->name, GFP_KERNEL);

			if (!domain->name) {

				kfree(domain);
@@ -160,7 +159,6 @@ struct irq_domain *__irq_domain_add(struct fwnode_handle *fwnode, int size, 
			domain->flags |= IRQ_DOMAIN_NAME_ALLOCATED;

			break;

		default:

			domain->fwnode = fwnode;

			domain->name = fwid->name;

			break;

		}
@@ -182,7 +180,6 @@ struct irq_domain *__irq_domain_add(struct fwnode_handle *fwnode, int size, 
		strreplace(name, '/', ':');



		domain->name = name;

		domain->fwnode = fwnode;

		domain->flags |= IRQ_DOMAIN_NAME_ALLOCATED;

	}
@@ -198,7 +195,7 @@ struct irq_domain *__irq_domain_add(struct fwnode_handle *fwnode, int size, 
		domain->flags |= IRQ_DOMAIN_NAME_ALLOCATED;

	}



	fwnode_handle_get(fwnode);

	domain->fwnode = fwnode_handle_get(fwnode);



	/* Fill structure */

	INIT_RADIX_TREE(&domain->revmap_tree, GFP_KERNEL);