git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
drivers
/
mfd
/
htc-i2cpld.c
diff --git
a/drivers/mfd/htc-i2cpld.c
b/drivers/mfd/htc-i2cpld.c
index 6bdb78c2ac77de535214d80a09cd9a302653d219..adbbce0ff630edfb02de146a13b711790e6e29a8 100644
(file)
--- a/
drivers/mfd/htc-i2cpld.c
+++ b/
drivers/mfd/htc-i2cpld.c
@@
-481,15
+481,9
@@
static int htcpld_register_chip_gpio(
ret = gpiochip_add(&(chip->chip_in));
if (ret) {
ret = gpiochip_add(&(chip->chip_in));
if (ret) {
- int error;
-
dev_warn(dev, "Unable to register input GPIOs for 0x%x: %d\n",
plat_chip_data->addr, ret);
dev_warn(dev, "Unable to register input GPIOs for 0x%x: %d\n",
plat_chip_data->addr, ret);
-
- error = gpiochip_remove(&(chip->chip_out));
- if (error)
- dev_warn(dev, "Error while trying to unregister gpio chip: %d\n", error);
-
+ gpiochip_remove(&(chip->chip_out));
return ret;
}
return ret;
}