Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
1a01417e
Commit
1a01417e
authored
Jul 05, 2009
by
Mark Brown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ASoC: Fix WM8960 leaks on probe failure
Signed-off-by:
Mark Brown
<
broonie@opensource.wolfsonmicro.com
>
parent
fe5422fc
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
5 deletions
+11
-5
sound/soc/codecs/wm8960.c
sound/soc/codecs/wm8960.c
+11
-5
No files found.
sound/soc/codecs/wm8960.c
View file @
1a01417e
...
...
@@ -810,7 +810,8 @@ static int wm8960_register(struct wm8960_priv *wm8960)
if
(
wm8960_codec
)
{
dev_err
(
codec
->
dev
,
"Another WM8960 is registered
\n
"
);
return
-
EINVAL
;
ret
=
-
EINVAL
;
goto
err
;
}
if
(
!
pdata
)
{
...
...
@@ -843,7 +844,7 @@ static int wm8960_register(struct wm8960_priv *wm8960)
ret
=
wm8960_reset
(
codec
);
if
(
ret
<
0
)
{
dev_err
(
codec
->
dev
,
"Failed to issue reset
\n
"
);
return
ret
;
goto
err
;
}
wm8960_dai
.
dev
=
codec
->
dev
;
...
...
@@ -877,17 +878,22 @@ static int wm8960_register(struct wm8960_priv *wm8960)
ret
=
snd_soc_register_codec
(
codec
);
if
(
ret
!=
0
)
{
dev_err
(
codec
->
dev
,
"Failed to register codec: %d
\n
"
,
ret
);
return
ret
;
goto
err
;
}
ret
=
snd_soc_register_dai
(
&
wm8960_dai
);
if
(
ret
!=
0
)
{
dev_err
(
codec
->
dev
,
"Failed to register DAI: %d
\n
"
,
ret
);
snd_soc_unregister_codec
(
codec
);
return
ret
;
goto
err_codec
;
}
return
0
;
err_codec:
snd_soc_unregister_codec
(
codec
);
err:
kfree
(
wm8960
);
return
ret
;
}
static
void
wm8960_unregister
(
struct
wm8960_priv
*
wm8960
)
...
...
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