From: Greg Kroah-Hartman Date: Wed, 28 Jan 2015 17:49:33 +0000 (-0800) Subject: updated queue-3.14/gpio-sysfs-fix-gpio-device-attribute-leak.patch X-Git-Tag: v3.10.67~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8cd1cbdabb5501ab433986c621e5ecc229a19863;p=thirdparty%2Fkernel%2Fstable-queue.git updated queue-3.14/gpio-sysfs-fix-gpio-device-attribute-leak.patch --- diff --git a/queue-3.14/gpio-sysfs-fix-gpio-device-attribute-leak.patch b/queue-3.14/gpio-sysfs-fix-gpio-device-attribute-leak.patch index dd9e3caa175..f238e14ba51 100644 --- a/queue-3.14/gpio-sysfs-fix-gpio-device-attribute-leak.patch +++ b/queue-3.14/gpio-sysfs-fix-gpio-device-attribute-leak.patch @@ -21,7 +21,6 @@ Signed-off-by: Johan Hovold Signed-off-by: Linus Walleij Signed-off-by: Greg Kroah-Hartman - --- drivers/gpio/gpiolib.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) @@ -99,12 +98,12 @@ Signed-off-by: Greg Kroah-Hartman fail_unregister_device: device_unregister(dev); fail_unlock: -@@ -994,6 +991,8 @@ void gpiod_unexport(struct gpio_desc *de +@@ -1003,6 +1000,8 @@ void gpiod_unexport(struct gpio_desc *de + mutex_unlock(&sysfs_lock); - dev = class_find_device(&gpio_class, NULL, desc, match_export); - if (dev) { -+ device_remove_file(dev, &dev_attr_edge); -+ device_remove_file(dev, &dev_attr_direction); - gpio_setup_irq(desc, dev, 0); - clear_bit(FLAG_EXPORT, &desc->flags); - } else + if (dev) { ++ device_remove_file(dev, &dev_attr_edge); ++ device_remove_file(dev, &dev_attr_direction); + device_unregister(dev); + put_device(dev); + }