projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pm+acpi-4.6-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[linux-2.6-block.git]
/
drivers
/
gpio
/
gpio-ucb1400.c
diff --git
a/drivers/gpio/gpio-ucb1400.c
b/drivers/gpio/gpio-ucb1400.c
index 2c5cd46bfa6ea62538714d07aa38b0b358e42ebb..5dbe31bf66991891e4c7f3dbf37afd961c6d3da8 100644
(file)
--- a/
drivers/gpio/gpio-ucb1400.c
+++ b/
drivers/gpio/gpio-ucb1400.c
@@
-67,7
+67,7
@@
static int ucb1400_gpio_probe(struct platform_device *dev)
ucb->gc.set = ucb1400_gpio_set;
ucb->gc.can_sleep = true;
- err =
gpiochip_add_data(
&ucb->gc, ucb);
+ err =
devm_gpiochip_add_data(&dev->dev,
&ucb->gc, ucb);
if (err)
goto err;
@@
-90,7
+90,6
@@
static int ucb1400_gpio_remove(struct platform_device *dev)
return err;
}
- gpiochip_remove(&ucb->gc);
return err;
}