[PATCH v2] at91: pmc: Fixed irq's name allocation for programmable clocks

Jean-Jacques Hiblot jjhiblot at traphandler.com
Tue Feb 4 03:21:45 EST 2014


The name provided to request_irq() must be valid until the irq is released.
This patch stores the name in the internal data structure.

Signed-off-by: Jean-Jacques Hiblot <jjhiblot at traphandler.com>
---
 drivers/clk/at91/clk-programmable.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/clk/at91/clk-programmable.c b/drivers/clk/at91/clk-programmable.c
index 8e242c7..799b75c 100644
--- a/drivers/clk/at91/clk-programmable.c
+++ b/drivers/clk/at91/clk-programmable.c
@@ -44,6 +44,7 @@ struct clk_programmable {
 	u8 css;
 	u8 pres;
 	u8 slckmck;
+	char irq_name[11];
 	const struct clk_programmable_layout *layout;
 };
 
@@ -247,7 +248,6 @@ at91_clk_register_programmable(struct at91_pmc *pmc, unsigned int irq,
 	struct clk_programmable *prog;
 	struct clk *clk = NULL;
 	struct clk_init_data init;
-	char irq_name[11];
 
 	if (id > PROG_ID_MAX)
 		return ERR_PTR(-EINVAL);
@@ -269,9 +269,9 @@ at91_clk_register_programmable(struct at91_pmc *pmc, unsigned int irq,
 	prog->irq = irq;
 	init_waitqueue_head(&prog->wait);
 	irq_set_status_flags(prog->irq, IRQ_NOAUTOEN);
-	snprintf(irq_name, sizeof(irq_name), "clk-prog%d", id);
+	snprintf(prog->irq_name, sizeof(prog->irq_name), "clk-prog%d", id);
 	ret = request_irq(prog->irq, clk_programmable_irq_handler,
-			  IRQF_TRIGGER_HIGH, irq_name, prog);
+			  IRQF_TRIGGER_HIGH, prog->irq_name, prog);
 	if (ret)
 		return ERR_PTR(ret);
 
-- 
1.8.5.2




More information about the linux-arm-kernel mailing list