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 remote-tracking branches 'asoc/fix/arizona', 'asoc/fix/dpcm', 'asoc/fix/dwc...
[sfrench/cifs-2.6.git]
/
drivers
/
mfd
/
palmas.c
diff --git
a/drivers/mfd/palmas.c
b/drivers/mfd/palmas.c
index 8f8bacb67a15a4608de39efa80f30a0f7a550d02..ee9e9ea104447a47c7fd222a61e9f78d098bc121 100644
(file)
--- a/
drivers/mfd/palmas.c
+++ b/
drivers/mfd/palmas.c
@@
-431,9
+431,6
@@
static void palmas_power_off(void)
unsigned int addr;
int ret, slave;
- if (!palmas_dev)
- return;
-
slave = PALMAS_BASE_TO_SLAVE(PALMAS_PMU_CONTROL_BASE);
addr = PALMAS_BASE_TO_REG(PALMAS_PMU_CONTROL_BASE, PALMAS_DEV_CTRL);