projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
rtc
/
rtc-bq32k.c
diff --git
a/drivers/rtc/rtc-bq32k.c
b/drivers/rtc/rtc-bq32k.c
index 314129e66d6e8fd47280202cacf19f0793848e58..92679df6d6e222dd12e4f2471f9e1b3109048c50 100644
(file)
--- a/
drivers/rtc/rtc-bq32k.c
+++ b/
drivers/rtc/rtc-bq32k.c
@@
-160,7
+160,7
@@
static int trickle_charger_of_init(struct device *dev, struct device_node *node)
dev_err(dev, "bq32k: diode and resistor mismatch\n");
return -EINVAL;
}
- reg = 0x
2
5;
+ reg = 0x
4
5;
break;
default: