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
17454310
Commit
17454310
authored
Aug 14, 2002
by
Petr Vandrovec
Committed by
Linus Torvalds
Aug 14, 2002
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] es1371 synchronize_irq
Update ES1371 to new synchronize_irq() API.
parent
9299c003
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
sound/oss/es1371.c
sound/oss/es1371.c
+4
-4
No files found.
sound/oss/es1371.c
View file @
17454310
...
@@ -1597,12 +1597,12 @@ static int es1371_ioctl(struct inode *inode, struct file *file, unsigned int cmd
...
@@ -1597,12 +1597,12 @@ static int es1371_ioctl(struct inode *inode, struct file *file, unsigned int cmd
case
SNDCTL_DSP_RESET
:
case
SNDCTL_DSP_RESET
:
if
(
file
->
f_mode
&
FMODE_WRITE
)
{
if
(
file
->
f_mode
&
FMODE_WRITE
)
{
stop_dac2
(
s
);
stop_dac2
(
s
);
synchronize_irq
();
synchronize_irq
(
s
->
irq
);
s
->
dma_dac2
.
swptr
=
s
->
dma_dac2
.
hwptr
=
s
->
dma_dac2
.
count
=
s
->
dma_dac2
.
total_bytes
=
0
;
s
->
dma_dac2
.
swptr
=
s
->
dma_dac2
.
hwptr
=
s
->
dma_dac2
.
count
=
s
->
dma_dac2
.
total_bytes
=
0
;
}
}
if
(
file
->
f_mode
&
FMODE_READ
)
{
if
(
file
->
f_mode
&
FMODE_READ
)
{
stop_adc
(
s
);
stop_adc
(
s
);
synchronize_irq
();
synchronize_irq
(
s
->
irq
);
s
->
dma_adc
.
swptr
=
s
->
dma_adc
.
hwptr
=
s
->
dma_adc
.
count
=
s
->
dma_adc
.
total_bytes
=
0
;
s
->
dma_adc
.
swptr
=
s
->
dma_adc
.
hwptr
=
s
->
dma_adc
.
count
=
s
->
dma_adc
.
total_bytes
=
0
;
}
}
return
0
;
return
0
;
...
@@ -2162,7 +2162,7 @@ static int es1371_ioctl_dac(struct inode *inode, struct file *file, unsigned int
...
@@ -2162,7 +2162,7 @@ static int es1371_ioctl_dac(struct inode *inode, struct file *file, unsigned int
case
SNDCTL_DSP_RESET
:
case
SNDCTL_DSP_RESET
:
stop_dac1
(
s
);
stop_dac1
(
s
);
synchronize_irq
();
synchronize_irq
(
s
->
irq
);
s
->
dma_dac1
.
swptr
=
s
->
dma_dac1
.
hwptr
=
s
->
dma_dac1
.
count
=
s
->
dma_dac1
.
total_bytes
=
0
;
s
->
dma_dac1
.
swptr
=
s
->
dma_dac1
.
hwptr
=
s
->
dma_dac1
.
count
=
s
->
dma_dac1
.
total_bytes
=
0
;
return
0
;
return
0
;
...
@@ -3006,7 +3006,7 @@ static void __devinit es1371_remove(struct pci_dev *dev)
...
@@ -3006,7 +3006,7 @@ static void __devinit es1371_remove(struct pci_dev *dev)
#endif
/* ES1371_DEBUG */
#endif
/* ES1371_DEBUG */
outl
(
0
,
s
->
io
+
ES1371_REG_CONTROL
);
/* switch everything off */
outl
(
0
,
s
->
io
+
ES1371_REG_CONTROL
);
/* switch everything off */
outl
(
0
,
s
->
io
+
ES1371_REG_SERIAL_CONTROL
);
/* clear serial interrupts */
outl
(
0
,
s
->
io
+
ES1371_REG_SERIAL_CONTROL
);
/* clear serial interrupts */
synchronize_irq
();
synchronize_irq
(
s
->
irq
);
free_irq
(
s
->
irq
,
s
);
free_irq
(
s
->
irq
,
s
);
if
(
s
->
gameport
.
io
)
{
if
(
s
->
gameport
.
io
)
{
gameport_unregister_port
(
&
s
->
gameport
);
gameport_unregister_port
(
&
s
->
gameport
);
...
...
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