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
1900d947
Commit
1900d947
authored
Apr 14, 2017
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-linus' into for-next
Back-merge to prepare for applying more FireWire updates.
parents
1e0f8f68
dfb00a56
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
7 deletions
+4
-7
sound/core/seq/seq_lock.c
sound/core/seq/seq_lock.c
+3
-6
sound/firewire/lib.h
sound/firewire/lib.h
+1
-1
No files found.
sound/core/seq/seq_lock.c
View file @
1900d947
...
...
@@ -28,19 +28,16 @@
/* wait until all locks are released */
void
snd_use_lock_sync_helper
(
snd_use_lock_t
*
lockp
,
const
char
*
file
,
int
line
)
{
int
max
_count
=
5
*
HZ
;
int
warn
_count
=
5
*
HZ
;
if
(
atomic_read
(
lockp
)
<
0
)
{
pr_warn
(
"ALSA: seq_lock: lock trouble [counter = %d] in %s:%d
\n
"
,
atomic_read
(
lockp
),
file
,
line
);
return
;
}
while
(
atomic_read
(
lockp
)
>
0
)
{
if
(
max_count
==
0
)
{
pr_warn
(
"ALSA: seq_lock: timeout [%d left] in %s:%d
\n
"
,
atomic_read
(
lockp
),
file
,
line
);
break
;
}
if
(
warn_count
--
==
0
)
pr_warn
(
"ALSA: seq_lock: waiting [%d left] in %s:%d
\n
"
,
atomic_read
(
lockp
),
file
,
line
);
schedule_timeout_uninterruptible
(
1
);
max_count
--
;
}
}
...
...
sound/firewire/lib.h
View file @
1900d947
...
...
@@ -45,7 +45,7 @@ struct snd_fw_async_midi_port {
struct
snd_rawmidi_substream
*
substream
;
snd_fw_async_midi_port_fill
fill
;
unsigned
int
consume_bytes
;
int
consume_bytes
;
};
int
snd_fw_async_midi_port_init
(
struct
snd_fw_async_midi_port
*
port
,
...
...
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