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
839d71d7
Commit
839d71d7
authored
Jul 24, 2002
by
Greg Kroah-Hartman
Committed by
Linus Torvalds
Jul 24, 2002
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] i810_audio.c cli/sti fix
Update for removed global irq lock
parent
409180f6
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
4 deletions
+3
-4
sound/oss/i810_audio.c
sound/oss/i810_audio.c
+3
-4
No files found.
sound/oss/i810_audio.c
View file @
839d71d7
...
@@ -1733,7 +1733,7 @@ static int i810_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
...
@@ -1733,7 +1733,7 @@ static int i810_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
}
}
spin_unlock_irqrestore
(
&
state
->
card
->
lock
,
flags
);
spin_unlock_irqrestore
(
&
state
->
card
->
lock
,
flags
);
synchronize_irq
();
synchronize_irq
(
state
->
card
->
irq
);
dmabuf
->
ready
=
0
;
dmabuf
->
ready
=
0
;
dmabuf
->
swptr
=
dmabuf
->
hwptr
=
0
;
dmabuf
->
swptr
=
dmabuf
->
hwptr
=
0
;
dmabuf
->
count
=
dmabuf
->
total_bytes
=
0
;
dmabuf
->
count
=
dmabuf
->
total_bytes
=
0
;
...
@@ -2814,15 +2814,14 @@ static void __init i810_configure_clocking (void)
...
@@ -2814,15 +2814,14 @@ static void __init i810_configure_clocking (void)
}
}
dmabuf
->
count
=
dmabuf
->
dmasize
;
dmabuf
->
count
=
dmabuf
->
dmasize
;
outb
(
31
,
card
->
iobase
+
dmabuf
->
write_channel
->
port
+
OFF_LVI
);
outb
(
31
,
card
->
iobase
+
dmabuf
->
write_channel
->
port
+
OFF_LVI
);
save_flags
(
flags
);
local_irq_save
(
flags
);
cli
();
start_dac
(
state
);
start_dac
(
state
);
offset
=
i810_get_dma_addr
(
state
,
0
);
offset
=
i810_get_dma_addr
(
state
,
0
);
mdelay
(
50
);
mdelay
(
50
);
new_offset
=
i810_get_dma_addr
(
state
,
0
);
new_offset
=
i810_get_dma_addr
(
state
,
0
);
stop_dac
(
state
);
stop_dac
(
state
);
outb
(
2
,
card
->
iobase
+
dmabuf
->
write_channel
->
port
+
OFF_CR
);
outb
(
2
,
card
->
iobase
+
dmabuf
->
write_channel
->
port
+
OFF_CR
);
restore_flags
(
flags
);
local_irq_restore
(
flags
);
i
=
new_offset
-
offset
;
i
=
new_offset
-
offset
;
#ifdef DEBUG
#ifdef DEBUG
printk
(
"i810_audio: %d bytes in 50 milliseconds
\n
"
,
i
);
printk
(
"i810_audio: %d bytes in 50 milliseconds
\n
"
,
i
);
...
...
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