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
nexedi
linux
Commits
f45a4a49
Commit
f45a4a49
authored
Oct 12, 2002
by
Alan Cox
Committed by
Linus Torvalds
Oct 12, 2002
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] hack fix for an obvious dmabuf bogon
parent
cb43695c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
sound/oss/dmabuf.c
sound/oss/dmabuf.c
+3
-3
No files found.
sound/oss/dmabuf.c
View file @
f45a4a49
...
@@ -443,6 +443,7 @@ int DMAbuf_sync(int dev)
...
@@ -443,6 +443,7 @@ int DMAbuf_sync(int dev)
adev
->
dmap_out
->
qlen
&&
adev
->
dmap_out
->
underrun_count
==
0
)
{
adev
->
dmap_out
->
qlen
&&
adev
->
dmap_out
->
underrun_count
==
0
)
{
long
t
=
dmabuf_timeout
(
dmap
);
long
t
=
dmabuf_timeout
(
dmap
);
spin_unlock_irqrestore
(
&
dmap
->
lock
,
flags
);
spin_unlock_irqrestore
(
&
dmap
->
lock
,
flags
);
/* FIXME: not safe may miss events */
t
=
interruptible_sleep_on_timeout
(
&
adev
->
out_sleeper
,
t
);
t
=
interruptible_sleep_on_timeout
(
&
adev
->
out_sleeper
,
t
);
spin_lock_irqsave
(
&
dmap
->
lock
,
flags
);
spin_lock_irqsave
(
&
dmap
->
lock
,
flags
);
if
(
!
t
)
{
if
(
!
t
)
{
...
@@ -521,12 +522,11 @@ int DMAbuf_activate_recording(int dev, struct dma_buffparms *dmap)
...
@@ -521,12 +522,11 @@ int DMAbuf_activate_recording(int dev, struct dma_buffparms *dmap)
if
(
!
(
adev
->
enable_bits
&
PCM_ENABLE_INPUT
))
if
(
!
(
adev
->
enable_bits
&
PCM_ENABLE_INPUT
))
return
0
;
return
0
;
if
(
dmap
->
dma_mode
==
DMODE_OUTPUT
)
{
/* Direction change */
if
(
dmap
->
dma_mode
==
DMODE_OUTPUT
)
{
/* Direction change */
unsigned
long
flags
;
/* release lock - it's not recursive */
/* release lock - it's not recursive */
spin_unlock_irq
restore
(
&
dmap
->
lock
,
flags
);
spin_unlock_irq
(
&
dmap
->
lock
);
DMAbuf_sync
(
dev
);
DMAbuf_sync
(
dev
);
DMAbuf_reset
(
dev
);
DMAbuf_reset
(
dev
);
spin_lock_irq
save
(
&
dmap
->
lock
,
flags
);
spin_lock_irq
(
&
dmap
->
lock
);
dmap
->
dma_mode
=
DMODE_NONE
;
dmap
->
dma_mode
=
DMODE_NONE
;
}
}
if
(
!
dmap
->
dma_mode
)
{
if
(
!
dmap
->
dma_mode
)
{
...
...
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