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
5a23f385
Commit
5a23f385
authored
Feb 13, 2019
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-linus' into for-next
Signed-off-by:
Takashi Iwai
<
tiwai@suse.de
>
parents
d9c0b2af
00a399ca
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
16 deletions
+4
-16
sound/core/pcm_lib.c
sound/core/pcm_lib.c
+4
-16
No files found.
sound/core/pcm_lib.c
View file @
5a23f385
...
@@ -2112,13 +2112,6 @@ int pcm_lib_apply_appl_ptr(struct snd_pcm_substream *substream,
...
@@ -2112,13 +2112,6 @@ int pcm_lib_apply_appl_ptr(struct snd_pcm_substream *substream,
return
0
;
return
0
;
}
}
/* allow waiting for a capture stream that hasn't been started */
#if IS_ENABLED(CONFIG_SND_PCM_OSS)
#define wait_capture_start(substream) ((substream)->oss.oss)
#else
#define wait_capture_start(substream) false
#endif
/* the common loop for read/write data */
/* the common loop for read/write data */
snd_pcm_sframes_t
__snd_pcm_lib_xfer
(
struct
snd_pcm_substream
*
substream
,
snd_pcm_sframes_t
__snd_pcm_lib_xfer
(
struct
snd_pcm_substream
*
substream
,
void
*
data
,
bool
interleaved
,
void
*
data
,
bool
interleaved
,
...
@@ -2184,16 +2177,11 @@ snd_pcm_sframes_t __snd_pcm_lib_xfer(struct snd_pcm_substream *substream,
...
@@ -2184,16 +2177,11 @@ snd_pcm_sframes_t __snd_pcm_lib_xfer(struct snd_pcm_substream *substream,
snd_pcm_update_hw_ptr
(
substream
);
snd_pcm_update_hw_ptr
(
substream
);
if
(
!
is_playback
&&
if
(
!
is_playback
&&
runtime
->
status
->
state
==
SNDRV_PCM_STATE_PREPARED
)
{
runtime
->
status
->
state
==
SNDRV_PCM_STATE_PREPARED
&&
if
(
size
>=
runtime
->
start_threshold
)
{
size
>=
runtime
->
start_threshold
)
{
err
=
snd_pcm_start
(
substream
);
err
=
snd_pcm_start
(
substream
);
if
(
err
<
0
)
if
(
err
<
0
)
goto
_end_unlock
;
}
else
if
(
!
wait_capture_start
(
substream
))
{
/* nothing to do */
err
=
0
;
goto
_end_unlock
;
goto
_end_unlock
;
}
}
}
avail
=
snd_pcm_avail
(
substream
);
avail
=
snd_pcm_avail
(
substream
);
...
...
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