Merge 4.7-rc4 into staging-next

We want the fixes in here, and we can resolve a merge issue in
drivers/iio/industrialio-trigger.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 24f60d28f0c0..58d822d7e8da 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -449,7 +449,6 @@ static void gpiodevice_release(struct device *dev)
 {
         struct gpio_device *gdev = dev_get_drvdata(dev);
 
-        cdev_del(&gdev->chrdev);
         list_del(&gdev->list);
         ida_simple_remove(&gpio_ida, gdev->id);
         kfree(gdev->label);
@@ -482,7 +481,6 @@ static int gpiochip_setup_dev(struct gpio_device *gdev)
 
         /* From this point, the .release() function cleans up gpio_device */
         gdev->dev.release = gpiodevice_release;
-        get_device(&gdev->dev);
         pr_debug("%s: registered GPIOs %d to %d on device: %s (%s)\n",
                  __func__, gdev->base, gdev->base + gdev->ngpio - 1,
                  dev_name(&gdev->dev), gdev->chip->label ? : "generic");
@@ -770,6 +768,8 @@ void gpiochip_remove(struct gpio_chip *chip)
          * be removed, else it will be dangling until the last user is
          * gone.
          */
+        cdev_del(&gdev->chrdev);
+        device_del(&gdev->dev);
         put_device(&gdev->dev);
 }
 EXPORT_SYMBOL_GPL(gpiochip_remove);
@@ -869,7 +869,7 @@ struct gpio_chip *gpiochip_find(void *data,
 
         spin_lock_irqsave(&gpio_lock, flags);
         list_for_each_entry(gdev, &gpio_devices, list)
-                if (match(gdev->chip, data))
+                if (gdev->chip && match(gdev->chip, data))
                         break;
 
         /* No match? */