OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bfa21a0
3913881
)
Merge branch 'topic/core' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
author
Mark Brown
<broonie@kernel.org>
Fri, 9 Jan 2015 18:03:55 +0000
(18:03 +0000)
committer
Mark Brown
<broonie@kernel.org>
Fri, 9 Jan 2015 18:03:55 +0000
(18:03 +0000)
Conflicts:
drivers/regulator/core.c
1
2
drivers/regulator/core.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/regulator/core.c
index
5fae8ca
,
c2554d8
..
685cc15
---
1
/
drivers/regulator/core.c
---
2
/
drivers/regulator/core.c
+++ b/
drivers/regulator/core.c
@@@
-3585,8
-3585,7
+3585,8
@@@
regulator_register(const struct regulat
{
const struct regulation_constraints *constraints = NULL;
const struct regulator_init_data *init_data;
- static atomic_t regulator_no = ATOMIC_INIT(0);
+ struct regulator_config *config = NULL;
+ static atomic_t regulator_no = ATOMIC_INIT(-1);
struct regulator_dev *rdev;
struct device *dev;
int ret, i;