diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2017-06-01 14:24:24 -0400 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2017-06-01 14:24:24 -0400 |
| commit | e3db1289e7432a882823a7effc474aff78868489 (patch) | |
| tree | 79188812b29602fe3b3641d55c32cfdc2101f0ef /kernel/irq/chip.c | |
| parent | c316cf670491def52a396d3bdc5a63ad01f7fefa (diff) | |
| parent | 05e97a9eda72d58dba293857df6aac62584ef99a (diff) | |
Merge MTD fixes into -next
Diffstat (limited to 'kernel/irq/chip.c')
| -rw-r--r-- | kernel/irq/chip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 686be4b73018..c94da688ee9b 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c | |||
| @@ -880,8 +880,8 @@ irq_set_chained_handler_and_data(unsigned int irq, irq_flow_handler_t handle, | |||
| 880 | if (!desc) | 880 | if (!desc) |
| 881 | return; | 881 | return; |
| 882 | 882 | ||
| 883 | __irq_do_set_handler(desc, handle, 1, NULL); | ||
| 884 | desc->irq_common_data.handler_data = data; | 883 | desc->irq_common_data.handler_data = data; |
| 884 | __irq_do_set_handler(desc, handle, 1, NULL); | ||
| 885 | 885 | ||
| 886 | irq_put_desc_busunlock(desc, flags); | 886 | irq_put_desc_busunlock(desc, flags); |
| 887 | } | 887 | } |