]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
gpio: bd70528: Use correct unit for debounce times
authorThierry Reding <treding@nvidia.com>
Fri, 8 Nov 2019 16:07:47 +0000 (17:07 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 29 Nov 2019 09:07:42 +0000 (10:07 +0100)
commit f88c117b6d6d7e96557b6ee143b26b550fc51076 upstream.

The debounce time passed to gpiod_set_debounce() is specified in
microseconds, so make sure to use the correct unit when computing the
register values, which denote delays in milliseconds.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Cc: <stable@vger.kernel.org>
Fixes: 18bc64b3aebf ("gpio: Initial support for ROHM bd70528 GPIO block")
[Bartosz: fixed a typo in commit message]
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpio/gpio-bd70528.c

index fd85605d2dabbf802b6b1a0c7c2b24a5ffedea54..01e122c3a9f11850b5ae91422ea3d21861c24759 100644 (file)
@@ -25,13 +25,13 @@ static int bd70528_set_debounce(struct bd70528_gpio *bdgpio,
        case 0:
                val = BD70528_DEBOUNCE_DISABLE;
                break;
-       case 1 ... 15:
+       case 1 ... 15000:
                val = BD70528_DEBOUNCE_15MS;
                break;
-       case 16 ... 30:
+       case 15001 ... 30000:
                val = BD70528_DEBOUNCE_30MS;
                break;
-       case 31 ... 50:
+       case 30001 ... 50000:
                val = BD70528_DEBOUNCE_50MS;
                break;
        default: