projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'akpm' (patches from Andrew)
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpio
/
gpio-msic.c
diff --git
a/drivers/gpio/gpio-msic.c
b/drivers/gpio/gpio-msic.c
index 01acf0a8cdb1963c3d01f1ca591aaab76b55158e..7bcfb87a5fa6812a51465d5c510a4c8a61c5d7d4 100644
(file)
--- a/
drivers/gpio/gpio-msic.c
+++ b/
drivers/gpio/gpio-msic.c
@@
-309,8
+309,7
@@
static int platform_msic_gpio_probe(struct platform_device *pdev)
&msic_irqchip,
handle_simple_irq);
}
- irq_set_chained_handler(mg->irq, msic_gpio_irq_handler);
- irq_set_handler_data(mg->irq, mg);
+ irq_set_chained_handler_and_data(mg->irq, msic_gpio_irq_handler, mg);
return 0;
err: