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
Kirill Smelkov
linux
Commits
64dceea4
Commit
64dceea4
authored
Apr 28, 2013
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'regulator/topic/tps6586x' into v3.9-rc8
parents
813dc1b0
6673d66e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
4 deletions
+2
-4
drivers/regulator/tps6586x-regulator.c
drivers/regulator/tps6586x-regulator.c
+2
-4
No files found.
drivers/regulator/tps6586x-regulator.c
View file @
64dceea4
...
...
@@ -246,7 +246,7 @@ static int tps6586x_regulator_set_slew_rate(struct platform_device *pdev,
reg
=
TPS6586X_SM1SL
;
break
;
default:
dev_
warn
(
&
pdev
->
dev
,
"Only SM0/SM1 can set slew rate
\n
"
);
dev_
err
(
&
pdev
->
dev
,
"Only SM0/SM1 can set slew rate
\n
"
);
return
-
EINVAL
;
}
...
...
@@ -305,14 +305,12 @@ static struct tps6586x_platform_data *tps6586x_parse_regulator_dt(
}
err
=
of_regulator_match
(
&
pdev
->
dev
,
regs
,
tps6586x_matches
,
num
);
of_node_put
(
regs
);
if
(
err
<
0
)
{
dev_err
(
&
pdev
->
dev
,
"Regulator match failed, e %d
\n
"
,
err
);
of_node_put
(
regs
);
return
NULL
;
}
of_node_put
(
regs
);
pdata
=
devm_kzalloc
(
&
pdev
->
dev
,
sizeof
(
*
pdata
),
GFP_KERNEL
);
if
(
!
pdata
)
{
dev_err
(
&
pdev
->
dev
,
"Memory alloction failed
\n
"
);
...
...
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