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
b242954b
Commit
b242954b
authored
Oct 07, 2013
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'spi/fix/mpc512x' into spi-linus
parents
78e9fa52
eadf69cf
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
drivers/spi/spi-mpc512x-psc.c
drivers/spi/spi-mpc512x-psc.c
+3
-1
No files found.
drivers/spi/spi-mpc512x-psc.c
View file @
b242954b
...
@@ -522,8 +522,10 @@ static int mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr,
...
@@ -522,8 +522,10 @@ static int mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr,
psc_num
=
master
->
bus_num
;
psc_num
=
master
->
bus_num
;
snprintf
(
clk_name
,
sizeof
(
clk_name
),
"psc%d_mclk"
,
psc_num
);
snprintf
(
clk_name
,
sizeof
(
clk_name
),
"psc%d_mclk"
,
psc_num
);
clk
=
devm_clk_get
(
dev
,
clk_name
);
clk
=
devm_clk_get
(
dev
,
clk_name
);
if
(
IS_ERR
(
clk
))
if
(
IS_ERR
(
clk
))
{
ret
=
PTR_ERR
(
clk
);
goto
free_irq
;
goto
free_irq
;
}
ret
=
clk_prepare_enable
(
clk
);
ret
=
clk_prepare_enable
(
clk
);
if
(
ret
)
if
(
ret
)
goto
free_irq
;
goto
free_irq
;
...
...
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