Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 476e2fc5 authored by Guenter Roeck's avatar Guenter Roeck Committed by Linus Walleij
Browse files

gpiolib: Do not use devm functions when registering gpio chip 



It is possible that a gpio chip is registered before the gpiolib
initialization code has run. This means we can not use devm_ functions
to allocate memory at that time. Do it the old fashioned way.

Cc: Alexandre Courbot <gnurou@gmail.com>
Cc: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent c4e5ffb6

drivers/gpio/gpiolib.c

+12 −7
Original line number Original line Diff line number Diff line
@@ -440,6 +440,8 @@ static void gpiodevice_release(struct device *dev) 
	cdev_del(&gdev->chrdev);

	cdev_del(&gdev->chrdev);

	list_del(&gdev->list);

	list_del(&gdev->list);

	ida_simple_remove(&gpio_ida, gdev->id);

	ida_simple_remove(&gpio_ida, gdev->id);

	kfree(gdev->label);

	kfree(gdev->descs);

	kfree(gdev);

	kfree(gdev);

}

}
@@ -504,8 +506,7 @@ int gpiochip_add_data(struct gpio_chip *chip, void *data) 
	else

	else

		gdev->owner = THIS_MODULE;

		gdev->owner = THIS_MODULE;





	gdev->descs = devm_kcalloc(&gdev->dev, chip->ngpio,

	gdev->descs = kcalloc(chip->ngpio, sizeof(gdev->descs[0]), GFP_KERNEL);

				   sizeof(gdev->descs[0]), GFP_KERNEL);

	if (!gdev->descs) {

	if (!gdev->descs) {

		status = -ENOMEM;

		status = -ENOMEM;

		goto err_free_gdev;

		goto err_free_gdev;
@@ -518,12 +519,12 @@ int gpiochip_add_data(struct gpio_chip *chip, void *data) 
	}

	}





	if (chip->label)

	if (chip->label)

		gdev->label = devm_kstrdup(&gdev->dev, chip->label, GFP_KERNEL);

		gdev->label = kstrdup(chip->label, GFP_KERNEL);

	else

	else

		gdev->label = devm_kstrdup(&gdev->dev, "unknown", GFP_KERNEL);

		gdev->label = kstrdup("unknown", GFP_KERNEL);

	if (!gdev->label) {

	if (!gdev->label) {

		status = -ENOMEM;

		status = -ENOMEM;

		goto err_free_gdev;

		goto err_free_descs;

	}

	}





	gdev->ngpio = chip->ngpio;

	gdev->ngpio = chip->ngpio;
@@ -543,7 +544,7 @@ int gpiochip_add_data(struct gpio_chip *chip, void *data) 
		if (base < 0) {

		if (base < 0) {

			status = base;

			status = base;

			spin_unlock_irqrestore(&gpio_lock, flags);

			spin_unlock_irqrestore(&gpio_lock, flags);

			goto err_free_gdev;

			goto err_free_label;

		}

		}

		/*

		/*

		 * TODO: it should not be necessary to reflect the assigned

		 * TODO: it should not be necessary to reflect the assigned
@@ -558,7 +559,7 @@ int gpiochip_add_data(struct gpio_chip *chip, void *data) 
	status = gpiodev_add_to_list(gdev);

	status = gpiodev_add_to_list(gdev);

	if (status) {

	if (status) {

		spin_unlock_irqrestore(&gpio_lock, flags);

		spin_unlock_irqrestore(&gpio_lock, flags);

		goto err_free_gdev;

		goto err_free_label;

	}

	}





	for (i = 0; i < chip->ngpio; i++) {

	for (i = 0; i < chip->ngpio; i++) {
@@ -637,6 +638,10 @@ int gpiochip_add_data(struct gpio_chip *chip, void *data) 
	spin_lock_irqsave(&gpio_lock, flags);

	spin_lock_irqsave(&gpio_lock, flags);

	list_del(&gdev->list);

	list_del(&gdev->list);

	spin_unlock_irqrestore(&gpio_lock, flags);

	spin_unlock_irqrestore(&gpio_lock, flags);

err_free_label:

	kfree(gdev->label);

err_free_descs:

	kfree(gdev->descs);

err_free_gdev:

err_free_gdev:

	ida_simple_remove(&gpio_ida, gdev->id);

	ida_simple_remove(&gpio_ida, gdev->id);

	/* failures here can mean systems won't boot... */

	/* failures here can mean systems won't boot... */