From e5f167f1df8c0975ab90489724e7f542cd72dc45 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 30 Aug 2014 17:11:41 -0700 Subject: [PATCH] greybus: can't use devm anymore, we aren't tieing into the driver model lifecycle :( --- drivers/staging/greybus/gpio-gb.c | 3 ++- drivers/staging/greybus/uart-gb.c | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/staging/greybus/gpio-gb.c b/drivers/staging/greybus/gpio-gb.c index 7b8b85f..43fd0d3 100644 --- a/drivers/staging/greybus/gpio-gb.c +++ b/drivers/staging/greybus/gpio-gb.c @@ -59,7 +59,7 @@ int gb_gpio_probe(struct greybus_device *gdev, struct device *dev = &gdev->dev; int retval; - gb_gpio = devm_kzalloc(dev, sizeof(*gb_gpio), GFP_KERNEL); + gb_gpio = kzalloc(dev, sizeof(*gb_gpio), GFP_KERNEL); if (!gb_gpio) return -ENOMEM; gb_gpio->gdev = gdev; @@ -95,6 +95,7 @@ void gb_gpio_disconnect(struct greybus_device *gdev) gb_gpio_dev = gdev->gb_gpio_dev; gpiochip_remove(&gb_gpio_dev->chip); + kfree(gb_gpio_dev); } #if 0 diff --git a/drivers/staging/greybus/uart-gb.c b/drivers/staging/greybus/uart-gb.c index 377ad38..298b9ff 100644 --- a/drivers/staging/greybus/uart-gb.c +++ b/drivers/staging/greybus/uart-gb.c @@ -390,7 +390,7 @@ int gb_tty_probe(struct greybus_device *gdev, int retval; int minor; - gb_tty = devm_kzalloc(&gdev->dev, sizeof(*gb_tty), GFP_KERNEL); + gb_tty = kzalloc(&gdev->dev, sizeof(*gb_tty), GFP_KERNEL); if (!gb_tty) return -ENOMEM; @@ -455,6 +455,8 @@ void gb_tty_disconnect(struct greybus_device *gdev) /* FIXME - free transmit / recieve buffers */ tty_port_put(&gb_tty->port); + + kfree(gb_tty); } static struct greybus_driver tty_gb_driver = { -- 2.7.4