Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Minor overlapping changes in the btusb and ixgbe drivers.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 11 insertions, 5 deletions

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index cca749010cd0..d9074191edef 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -536,6 +536,14 @@ static int linehandle_create(struct gpio_device *gdev, void __user *ip)
                 return -EINVAL;
 
         /*
+         * Do not allow both INPUT & OUTPUT flags to be set as they are
+         * contradictory.
+         */
+        if ((lflags & GPIOHANDLE_REQUEST_INPUT) &&
+            (lflags & GPIOHANDLE_REQUEST_OUTPUT))
+                return -EINVAL;
+
+        /*
          * Do not allow OPEN_SOURCE & OPEN_DRAIN flags in a single request. If
          * the hardware actually supports enabling both at the same time the
          * electrical result would be disastrous.
@@ -926,7 +934,9 @@ static int lineevent_create(struct gpio_device *gdev, void __user *ip)
         }
 
         /* This is just wrong: we don't look for events on output lines */
-        if (lflags & GPIOHANDLE_REQUEST_OUTPUT) {
+        if ((lflags & GPIOHANDLE_REQUEST_OUTPUT) ||
+            (lflags & GPIOHANDLE_REQUEST_OPEN_DRAIN) ||
+            (lflags & GPIOHANDLE_REQUEST_OPEN_SOURCE)) {
                 ret = -EINVAL;
                 goto out_free_label;
         }
@@ -940,10 +950,6 @@ static int lineevent_create(struct gpio_device *gdev, void __user *ip)
 
         if (lflags & GPIOHANDLE_REQUEST_ACTIVE_LOW)
                 set_bit(FLAG_ACTIVE_LOW, &desc->flags);
-        if (lflags & GPIOHANDLE_REQUEST_OPEN_DRAIN)
-                set_bit(FLAG_OPEN_DRAIN, &desc->flags);
-        if (lflags & GPIOHANDLE_REQUEST_OPEN_SOURCE)
-                set_bit(FLAG_OPEN_SOURCE, &desc->flags);
 
         ret = gpiod_direction_input(desc);
         if (ret)