diff options
| author | CrossR <r.cross@lancaster.ac.uk> | 2020-08-19 20:53:40 +0100 |
|---|---|---|
| committer | CrossR <r.cross@lancaster.ac.uk> | 2020-08-19 20:53:40 +0100 |
| commit | f8a635aaa0b379d499c0b4c4cd5d7831e1fda7fd (patch) | |
| tree | b2adb5a989b2a67360aea46abe0d13ffa02734a9 /app/drivers | |
| parent | dcd36f12e049ee2c423204ebaaa3c16062d9fd5e (diff) | |
| parent | ebd6fbb2254cfcdd8af6309dd9a5c3251ac19935 (diff) | |
Merge remote-tracking branch 'upstream/main' into CrossR/Sofle
Diffstat (limited to 'app/drivers')
| -rw-r--r-- | app/drivers/zephyr/kscan_gpio_matrix.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/app/drivers/zephyr/kscan_gpio_matrix.c b/app/drivers/zephyr/kscan_gpio_matrix.c index baaca30..b19c492 100644 --- a/app/drivers/zephyr/kscan_gpio_matrix.c +++ b/app/drivers/zephyr/kscan_gpio_matrix.c @@ -205,7 +205,13 @@ static int kscan_gpio_config_interrupts(struct device **devices, } \ data->callback = callback; \ return 0; \ - } \ + }; \ + static int kscan_gpio_enable_##n(struct device *dev) \ + { \ + int err = kscan_gpio_enable_interrupts_##n(dev); \ + if (err) { return err; } \ + return kscan_gpio_read_##n(dev); \ + }; \ static int kscan_gpio_init_##n(struct device *dev) \ { \ struct kscan_gpio_data_##n *data = dev->driver_data; \ @@ -258,7 +264,7 @@ static int kscan_gpio_config_interrupts(struct device **devices, } \ static const struct kscan_driver_api gpio_driver_api_##n = { \ .config = kscan_gpio_configure_##n, \ - .enable_callback = kscan_gpio_enable_interrupts_##n, \ + .enable_callback = kscan_gpio_enable_##n, \ .disable_callback = kscan_gpio_disable_interrupts_##n, \ }; \ static const struct kscan_gpio_config_##n kscan_gpio_config_##n = { \ |