summaryrefslogtreecommitdiff
path: root/kernel/irq/manage.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-10-14 10:11:45 +0200
committerIngo Molnar <mingo@kernel.org>2017-10-14 10:11:45 +0200
commit6edcf57233108df2e50ab5d3fa695ea958b4c779 (patch)
tree7f233132de3cf1d438ac5ca51cfa6e9c48f8b86f /kernel/irq/manage.c
parent1e4078f0bba46ad61b69548abe6a6faf63b89380 (diff)
parent3dd40cb320fee7c23b574ab821ce140ccd1281c9 (diff)
Merge branch 'core/urgent' into x86/asm, to pick up dependency
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/irq/manage.c')
-rw-r--r--kernel/irq/manage.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 573dc52b0806..d00132b5c325 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -1643,6 +1643,10 @@ const void *free_irq(unsigned int irq, void *dev_id)
#endif
action = __free_irq(irq, dev_id);
+
+ if (!action)
+ return NULL;
+
devname = action->name;
kfree(action);
return devname;