Home Home > GIT Browse > SLE15
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2018-08-03 14:40:31 +0200
committerTakashi Iwai <tiwai@suse.de>2018-08-03 14:40:31 +0200
commit59c041e48f22eff6f8e2bae7dff76fc8d0b01451 (patch)
tree248521ea98c811d1b5c26735e9ad59c94cc88359
parent91a1948a08a59a38fc48d9b9630f35e259681f4d (diff)
parentfb56e8f7e9e1b136a0e958241a6013be6e83674c (diff)
Merge branch 'users/hare/SLE15/for-next' into SLE15
Pull genirq fix from Hannes Reinecke suse-commit: cb38cecb001b854fc5d3fc280e6d205b0a02cfd7
-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 6567d04262d4..c16c9fd151ff 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -1623,6 +1623,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;