summaryrefslogtreecommitdiffstats
path: root/kernel/irq
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2017-06-20 01:37:04 +0200
committerThomas Gleixner <tglx@linutronix.de>2017-06-22 18:21:08 +0200
commit0165308a2f994939d2e1b36624f5a8f57746bc88 (patch)
tree027fee7d5a4cc1dd8dc9f6d0487df3108d457073 /kernel/irq
parent1bb3a5a76386ba2886ee44b903eeff5765bd71d4 (diff)
downloadlinux-0165308a2f994939d2e1b36624f5a8f57746bc88.tar.bz2
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@linutronix.de> Acked-by: Marc Zyngier <marc.zyngier@arm.com> Cc: Jens Axboe <axboe@kernel.dk> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Keith Busch <keith.busch@intel.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Christoph Hellwig <hch@lst.de> Link: http://lkml.kernel.org/r/20170619235443.510684976@linutronix.de
Diffstat (limited to 'kernel/irq')
-rw-r--r--kernel/irq/msi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c
index fe4d48ec5bc4..9e3f1857c6bd 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;