mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-09-20 19:34:46 +00:00
gpio: sysfs: fix gpio-chip device-attribute leak
commit 121b6a79955a3a3fd7bbb9b8cb88d5b9dad6283d upstream.
The gpio-chip device attributes were never destroyed when the device was
removed.
Fix by using device_create_with_groups() to create the device attributes
of the chip class device.
Note that this also fixes the attribute-creation race with userspace.
Fixes: d8f388d8dc
("gpio: sysfs interface")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
5d53369ea5
commit
aa35a48704
|
@ -627,7 +627,7 @@ static ssize_t chip_ngpio_show(struct device *dev,
|
|||
}
|
||||
static DEVICE_ATTR(ngpio, 0444, chip_ngpio_show, NULL);
|
||||
|
||||
static const struct attribute *gpiochip_attrs[] = {
|
||||
static struct attribute *gpiochip_attrs[] = {
|
||||
&dev_attr_base.attr,
|
||||
&dev_attr_label.attr,
|
||||
&dev_attr_ngpio.attr,
|
||||
|
@ -635,7 +635,7 @@ static const struct attribute *gpiochip_attrs[] = {
|
|||
};
|
||||
|
||||
static const struct attribute_group gpiochip_attr_group = {
|
||||
.attrs = (struct attribute **) gpiochip_attrs,
|
||||
.attrs = gpiochip_attrs,
|
||||
};
|
||||
|
||||
/*
|
||||
|
@ -1036,6 +1036,7 @@ static void gpiochip_unexport(struct gpio_chip *chip)
|
|||
mutex_lock(&sysfs_lock);
|
||||
dev = class_find_device(&gpio_class, NULL, chip, match_export);
|
||||
if (dev) {
|
||||
sysfs_remove_group(&dev->kobj, &gpiochip_attr_group);
|
||||
put_device(dev);
|
||||
device_unregister(dev);
|
||||
chip->exported = 0;
|
||||
|
|
Loading…
Reference in a new issue