Input: gpio_event: Don't call gpio_cansleep before gpio_request.

If the gpio did not exist it would crash in gpiolib.

Signed-off-by: Arve Hjønnevåg <arve@android.com>

diff --git a/drivers/input/misc/gpio_matrix.c b/drivers/input/misc/gpio_matrix.c
index f645471b54dd5a8abbf009622a5492c3e98500a7..08b881325eac91896589b745643a9217f56dd17c 100644 (file)
--- a/drivers/input/misc/gpio_matrix.c
+++ b/drivers/input/misc/gpio_matrix.c
@@ -336,18 +336,18 @@ int gpio_event_matrix_func(struct gpio_event_input_devs *input_devs,
                }
 
                for (i = 0; i < mi->noutputs; i++) {
-                       if (gpio_cansleep(mi->output_gpios[i])) {
-                               pr_err("gpiomatrix: unsupported output gpio %d,"
-                                       " can sleep\n", mi->output_gpios[i]);
-                               err = -EINVAL;
-                               goto err_request_output_gpio_failed;
-                       }
                        err = gpio_request(mi->output_gpios[i], "gpio_kp_out");
                        if (err) {
                                pr_err("gpiomatrix: gpio_request failed for "
                                        "output %d\n", mi->output_gpios[i]);
                                goto err_request_output_gpio_failed;
                        }
+                       if (gpio_cansleep(mi->output_gpios[i])) {
+                               pr_err("gpiomatrix: unsupported output gpio %d,"
+                                       " can sleep\n", mi->output_gpios[i]);
+                               err = -EINVAL;
+                               goto err_output_gpio_configure_failed;
+                       }
                        if (mi->flags & GPIOKPF_DRIVE_INACTIVE)
                                err = gpio_direction_output(mi->output_gpios[i],
                                        !(mi->flags & GPIOKPF_ACTIVE_HIGH));