Merge tag 'pwm/for-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...

[firefly-linux-kernel-4.4.55.git] / drivers / input / keyboard / gpio_keys.c

diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index 883d6aed5b9ac12f47bc3a137bbf8e61c0bd1ec2..ddf4045de08466210788ed583066b482e3951e38 100644 (file)
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -190,7 +190,7 @@ static ssize_t gpio_keys_attr_show_helper(struct gpio_keys_drvdata *ddata,
                __set_bit(bdata->button->code, bits);
        }
 
-       ret = bitmap_scnlistprintf(buf, PAGE_SIZE - 2, bits, n_events);
+       ret = scnprintf(buf, PAGE_SIZE - 1, "%*pbl", n_events, bits);
        buf[ret++] = '\n';
        buf[ret] = '\0';