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
0422e5e0
Commit
0422e5e0
authored
May 27, 2016
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/topic/qcom' into asoc-next
parents
77c92d2b
cef794f7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
sound/soc/qcom/lpass-platform.c
sound/soc/qcom/lpass-platform.c
+5
-3
No files found.
sound/soc/qcom/lpass-platform.c
View file @
0422e5e0
...
...
@@ -474,7 +474,7 @@ static int lpass_platform_pcm_new(struct snd_soc_pcm_runtime *soc_runtime)
struct
lpass_data
*
drvdata
=
snd_soc_platform_get_drvdata
(
soc_runtime
->
platform
);
struct
lpass_variant
*
v
=
drvdata
->
variant
;
int
ret
;
int
ret
=
-
EINVAL
;
struct
lpass_pcm_data
*
data
;
size_t
size
=
lpass_platform_pcm_hardware
.
buffer_bytes_max
;
...
...
@@ -491,7 +491,7 @@ static int lpass_platform_pcm_new(struct snd_soc_pcm_runtime *soc_runtime)
data
->
rdma_ch
=
v
->
alloc_dma_channel
(
drvdata
,
SNDRV_PCM_STREAM_PLAYBACK
);
if
(
IS_ERR_VALUE
(
data
->
rdma_ch
)
)
if
(
data
->
rdma_ch
<
0
)
return
data
->
rdma_ch
;
drvdata
->
substream
[
data
->
rdma_ch
]
=
psubstream
;
...
...
@@ -518,8 +518,10 @@ static int lpass_platform_pcm_new(struct snd_soc_pcm_runtime *soc_runtime)
data
->
wrdma_ch
=
v
->
alloc_dma_channel
(
drvdata
,
SNDRV_PCM_STREAM_CAPTURE
);
if
(
IS_ERR_VALUE
(
data
->
wrdma_ch
))
if
(
data
->
wrdma_ch
<
0
)
{
ret
=
data
->
wrdma_ch
;
goto
capture_alloc_err
;
}
drvdata
->
substream
[
data
->
wrdma_ch
]
=
csubstream
;
...
...
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