Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
7055a314
Commit
7055a314
authored
Jul 24, 2015
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
parents
52721d9d
9f7e25ed
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
3 deletions
+7
-3
drivers/regulator/core.c
drivers/regulator/core.c
+7
-3
No files found.
drivers/regulator/core.c
View file @
7055a314
...
@@ -1381,10 +1381,14 @@ static int regulator_resolve_supply(struct regulator_dev *rdev)
...
@@ -1381,10 +1381,14 @@ static int regulator_resolve_supply(struct regulator_dev *rdev)
}
}
if
(
!
r
)
{
if
(
!
r
)
{
if
(
have_full_constraints
())
{
r
=
dummy_regulator_rdev
;
}
else
{
dev_err
(
dev
,
"Failed to resolve %s-supply for %s
\n
"
,
dev_err
(
dev
,
"Failed to resolve %s-supply for %s
\n
"
,
rdev
->
supply_name
,
rdev
->
desc
->
name
);
rdev
->
supply_name
,
rdev
->
desc
->
name
);
return
-
EPROBE_DEFER
;
return
-
EPROBE_DEFER
;
}
}
}
/* Recursively resolve the supply of the supply */
/* Recursively resolve the supply of the supply */
ret
=
regulator_resolve_supply
(
r
);
ret
=
regulator_resolve_supply
(
r
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment