drop gpiolib patch from 4.18

diff --git a/queue-4.18/gpiolib-don-t-allow-userspace-to-set-values-of-input-lines.patch b/queue-4.18/gpiolib-don-t-allow-userspace-to-set-values-of-input-lines.patch
deleted file mode 100644 (file)
index 37aaebc..0000000
--- a/queue-4.18/gpiolib-don-t-allow-userspace-to-set-values-of-input-lines.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From foo@baz Mon Sep 24 09:45:39 CEST 2018
-From: Bartosz Golaszewski <brgl@bgdev.pl>
-Date: Mon, 16 Jul 2018 10:34:23 +0200
-Subject: gpiolib: don't allow userspace to set values of input lines
-
-From: Bartosz Golaszewski <brgl@bgdev.pl>
-
-[ Upstream commit e5332d5437764f775cf4e3b8ca3bf592af063a02 ]
-
-User space can currently both read and set values of input lines using
-the character device. This was not allowed by the old sysfs interface
-nor is it a correct behavior.
-
-Check the first descriptor in the set for the OUT flag when asked to
-set values and return -EPERM if the line is input.
-
-Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpio/gpiolib.c |    8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
---- a/drivers/gpio/gpiolib.c
-+++ b/drivers/gpio/gpiolib.c
-@@ -449,7 +449,13 @@ static long linehandle_ioctl(struct file
- 
-               return 0;
-       } else if (cmd == GPIOHANDLE_SET_LINE_VALUES_IOCTL) {
--              /* TODO: check if descriptors are really output */
-+              /*
-+               * All line descriptors were created at once with the same
-+               * flags so just check if the first one is really output.
-+               */
-+              if (!test_bit(FLAG_IS_OUT, &lh->descs[0]->flags))
-+                      return -EPERM;
-+
-               if (copy_from_user(&ghd, ip, sizeof(ghd)))
-                       return -EFAULT;
- 

diff --git a/queue-4.18/gpiolib-respect-error-code-of-get_direction.patch b/queue-4.18/gpiolib-respect-error-code-of-get_direction.patch
index 92ecf2af757b73553e9a0f467026c199b3a3c21f..b477cde6fba6d97f61c9c77d50cf568ebd4faa84 100644 (file)
--- a/queue-4.18/gpiolib-respect-error-code-of-get_direction.patch
+++ b/queue-4.18/gpiolib-respect-error-code-of-get_direction.patch
@@ -24,7 +24,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/drivers/gpio/gpiolib.c
 +++ b/drivers/gpio/gpiolib.c
-@@ -3257,6 +3257,12 @@ int gpiochip_lock_as_irq(struct gpio_chi
+@@ -3251,6 +3251,12 @@ int gpiochip_lock_as_irq(struct gpio_chi
        if (!chip->can_sleep && chip->get_direction) {
                int dir = chip->get_direction(chip, offset);
  

diff --git a/queue-4.18/series b/queue-4.18/series
index a47465c15bbc14dbb7e5306514e856016db6c1c8..25bcf9167124b2e726954702295b0b01ff60c682 100644 (file)
--- a/queue-4.18/series
+++ b/queue-4.18/series
@@ -174,7 +174,6 @@ arm-hisi-check-of_iomap-and-fix-missing-of_node_put.patch
 liquidio-fix-hang-when-re-binding-vf-host-drv-after-running-dpdk-vf-driver.patch
 gpu-ipu-v3-csi-pass-back-mbus_code_to_bus_cfg-error-codes.patch
 asoc-hdmi-codec-fix-routing.patch
-gpiolib-don-t-allow-userspace-to-set-values-of-input-lines.patch
 serial-8250-of-correct-of_platform_serial_setup-error-handling.patch
 tty-fix-termios-input-speed-encoding-when-using-bother.patch
 tty-fix-termios-input-speed-encoding.patch