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
31824e65
Commit
31824e65
authored
Jan 20, 2014
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/topic/dma' into asoc-next
parents
4cfa1a38
ec4f2857
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
sound/soc/soc-generic-dmaengine-pcm.c
sound/soc/soc-generic-dmaengine-pcm.c
+6
-3
No files found.
sound/soc/soc-generic-dmaengine-pcm.c
View file @
31824e65
...
@@ -176,17 +176,20 @@ static struct dma_chan *dmaengine_pcm_compat_request_channel(
...
@@ -176,17 +176,20 @@ static struct dma_chan *dmaengine_pcm_compat_request_channel(
{
{
struct
dmaengine_pcm
*
pcm
=
soc_platform_to_pcm
(
rtd
->
platform
);
struct
dmaengine_pcm
*
pcm
=
soc_platform_to_pcm
(
rtd
->
platform
);
struct
snd_dmaengine_dai_dma_data
*
dma_data
;
struct
snd_dmaengine_dai_dma_data
*
dma_data
;
dma_filter_fn
fn
=
NULL
;
dma_data
=
snd_soc_dai_get_dma_data
(
rtd
->
cpu_dai
,
substream
);
dma_data
=
snd_soc_dai_get_dma_data
(
rtd
->
cpu_dai
,
substream
);
if
((
pcm
->
flags
&
SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX
)
&&
pcm
->
chan
[
0
])
if
((
pcm
->
flags
&
SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX
)
&&
pcm
->
chan
[
0
])
return
pcm
->
chan
[
0
];
return
pcm
->
chan
[
0
];
if
(
pcm
->
config
->
compat_request_channel
)
if
(
pcm
->
config
&&
pcm
->
config
->
compat_request_channel
)
return
pcm
->
config
->
compat_request_channel
(
rtd
,
substream
);
return
pcm
->
config
->
compat_request_channel
(
rtd
,
substream
);
return
snd_dmaengine_pcm_request_channel
(
pcm
->
config
->
compat_filter_fn
,
if
(
pcm
->
config
)
dma_data
->
filter_data
);
fn
=
pcm
->
config
->
compat_filter_fn
;
return
snd_dmaengine_pcm_request_channel
(
fn
,
dma_data
->
filter_data
);
}
}
static
bool
dmaengine_pcm_can_report_residue
(
struct
dma_chan
*
chan
)
static
bool
dmaengine_pcm_can_report_residue
(
struct
dma_chan
*
chan
)
...
...
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