diff options
-rw-r--r-- | drivers/input/keyboard/adp5589-keys.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/input/keyboard/adp5589-keys.c b/drivers/input/keyboard/adp5589-keys.c index 4d446d5085aa..c01a1d648f9f 100644 --- a/drivers/input/keyboard/adp5589-keys.c +++ b/drivers/input/keyboard/adp5589-keys.c | |||
@@ -235,7 +235,7 @@ struct adp5589_kpad { | |||
235 | unsigned short gpimapsize; | 235 | unsigned short gpimapsize; |
236 | unsigned extend_cfg; | 236 | unsigned extend_cfg; |
237 | bool is_adp5585; | 237 | bool is_adp5585; |
238 | bool adp5585_support_row5; | 238 | bool support_row5; |
239 | #ifdef CONFIG_GPIOLIB | 239 | #ifdef CONFIG_GPIOLIB |
240 | unsigned char gpiomap[ADP5589_MAXGPIO]; | 240 | unsigned char gpiomap[ADP5589_MAXGPIO]; |
241 | bool export_gpio; | 241 | bool export_gpio; |
@@ -485,7 +485,7 @@ static int adp5589_build_gpiomap(struct adp5589_kpad *kpad, | |||
485 | if (kpad->extend_cfg & C4_EXTEND_CFG) | 485 | if (kpad->extend_cfg & C4_EXTEND_CFG) |
486 | pin_used[kpad->var->c4_extend_cfg] = true; | 486 | pin_used[kpad->var->c4_extend_cfg] = true; |
487 | 487 | ||
488 | if (!kpad->adp5585_support_row5) | 488 | if (!kpad->support_row5) |
489 | pin_used[5] = true; | 489 | pin_used[5] = true; |
490 | 490 | ||
491 | for (i = 0; i < kpad->var->maxgpio; i++) | 491 | for (i = 0; i < kpad->var->maxgpio; i++) |
@@ -884,12 +884,13 @@ static int adp5589_probe(struct i2c_client *client, | |||
884 | 884 | ||
885 | switch (id->driver_data) { | 885 | switch (id->driver_data) { |
886 | case ADP5585_02: | 886 | case ADP5585_02: |
887 | kpad->adp5585_support_row5 = true; | 887 | kpad->support_row5 = true; |
888 | case ADP5585_01: | 888 | case ADP5585_01: |
889 | kpad->is_adp5585 = true; | 889 | kpad->is_adp5585 = true; |
890 | kpad->var = &const_adp5585; | 890 | kpad->var = &const_adp5585; |
891 | break; | 891 | break; |
892 | case ADP5589: | 892 | case ADP5589: |
893 | kpad->support_row5 = true; | ||
893 | kpad->var = &const_adp5589; | 894 | kpad->var = &const_adp5589; |
894 | break; | 895 | break; |
895 | } | 896 | } |