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
1cdf4f61
Commit
1cdf4f61
authored
Jun 22, 2015
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next
parents
2924c962
474ff0ae
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
sound/soc/fsl/imx-wm8962.c
sound/soc/fsl/imx-wm8962.c
+1
-1
No files found.
sound/soc/fsl/imx-wm8962.c
View file @
1cdf4f61
...
@@ -190,7 +190,7 @@ static int imx_wm8962_probe(struct platform_device *pdev)
...
@@ -190,7 +190,7 @@ static int imx_wm8962_probe(struct platform_device *pdev)
dev_err
(
&
pdev
->
dev
,
"audmux internal port setup failed
\n
"
);
dev_err
(
&
pdev
->
dev
,
"audmux internal port setup failed
\n
"
);
return
ret
;
return
ret
;
}
}
imx_audmux_v2_configure_port
(
ext_port
,
ret
=
imx_audmux_v2_configure_port
(
ext_port
,
IMX_AUDMUX_V2_PTCR_SYN
,
IMX_AUDMUX_V2_PTCR_SYN
,
IMX_AUDMUX_V2_PDCR_RXDSEL
(
int_port
));
IMX_AUDMUX_V2_PDCR_RXDSEL
(
int_port
));
if
(
ret
)
{
if
(
ret
)
{
...
...
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