Commit-ID: 0165308a2f994939d2e1b36624f5a8f57746bc88 Gitweb: http://git.kernel.org/tip/0165308a2f994939d2e1b36624f5a8f57746bc88 Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx> AuthorDate: Tue, 20 Jun 2017 01:37:04 +0200 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitDate: Thu, 22 Jun 2017 18:21:08 +0200 genirq/msi: Prevent overwriting domain name Prevent overwriting an already assigned domain name. Remove the extra check for chip->name, because if domain->name is NULL overwriting it with NULL is not a problem. Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Acked-by: Marc Zyngier <marc.zyngier@xxxxxxx> Cc: Jens Axboe <axboe@xxxxxxxxx> Cc: Michael Ellerman <mpe@xxxxxxxxxxxxxx> Cc: Keith Busch <keith.busch@xxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Christoph Hellwig <hch@xxxxxx> Link: http://lkml.kernel.org/r/20170619235443.510684976@xxxxxxxxxxxxx --- kernel/irq/msi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c index fe4d48e..9e3f185 100644 --- a/kernel/irq/msi.c +++ b/kernel/irq/msi.c @@ -274,7 +274,8 @@ struct irq_domain *msi_create_irq_domain(struct fwnode_handle *fwnode, domain = irq_domain_create_hierarchy(parent, IRQ_DOMAIN_FLAG_MSI, 0, fwnode, &msi_domain_ops, info); - if (domain && info->chip && info->chip->name) + + if (domain && !domain->name && info->chip) domain->name = info->chip->name; return domain; -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|