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
2d0ed106
Commit
2d0ed106
authored
Apr 20, 2003
by
Linus Torvalds
Committed by
Linus Torvalds
Apr 20, 2003
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update ensoniq driver to return whether the interrupt was for it
or not.
parent
3132fdcb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
sound/pci/ens1370.c
sound/pci/ens1370.c
+5
-4
No files found.
sound/pci/ens1370.c
View file @
2d0ed106
...
@@ -412,7 +412,7 @@ struct _snd_ensoniq {
...
@@ -412,7 +412,7 @@ struct _snd_ensoniq {
#endif
#endif
};
};
static
void
snd_audiopci_interrupt
(
int
irq
,
void
*
dev_id
,
struct
pt_regs
*
regs
);
static
irqreturn_t
snd_audiopci_interrupt
(
int
irq
,
void
*
dev_id
,
struct
pt_regs
*
regs
);
static
struct
pci_device_id
snd_audiopci_ids
[]
__devinitdata
=
{
static
struct
pci_device_id
snd_audiopci_ids
[]
__devinitdata
=
{
#ifdef CHIP1370
#ifdef CHIP1370
...
@@ -2231,17 +2231,17 @@ static int __devinit snd_ensoniq_midi(ensoniq_t * ensoniq, int device, snd_rawmi
...
@@ -2231,17 +2231,17 @@ static int __devinit snd_ensoniq_midi(ensoniq_t * ensoniq, int device, snd_rawmi
* Interrupt handler
* Interrupt handler
*/
*/
static
void
snd_audiopci_interrupt
(
int
irq
,
void
*
dev_id
,
struct
pt_regs
*
regs
)
static
irqreturn_t
snd_audiopci_interrupt
(
int
irq
,
void
*
dev_id
,
struct
pt_regs
*
regs
)
{
{
ensoniq_t
*
ensoniq
=
snd_magic_cast
(
ensoniq_t
,
dev_id
,
return
);
ensoniq_t
*
ensoniq
=
snd_magic_cast
(
ensoniq_t
,
dev_id
,
return
);
unsigned
int
status
,
sctrl
;
unsigned
int
status
,
sctrl
;
if
(
ensoniq
==
NULL
)
if
(
ensoniq
==
NULL
)
return
;
return
IRQ_NONE
;
status
=
inl
(
ES_REG
(
ensoniq
,
STATUS
));
status
=
inl
(
ES_REG
(
ensoniq
,
STATUS
));
if
(
!
(
status
&
ES_INTR
))
if
(
!
(
status
&
ES_INTR
))
return
;
return
IRQ_NONE
;
spin_lock
(
&
ensoniq
->
reg_lock
);
spin_lock
(
&
ensoniq
->
reg_lock
);
sctrl
=
ensoniq
->
sctrl
;
sctrl
=
ensoniq
->
sctrl
;
...
@@ -2263,6 +2263,7 @@ static void snd_audiopci_interrupt(int irq, void *dev_id, struct pt_regs *regs)
...
@@ -2263,6 +2263,7 @@ static void snd_audiopci_interrupt(int irq, void *dev_id, struct pt_regs *regs)
snd_pcm_period_elapsed
(
ensoniq
->
capture_substream
);
snd_pcm_period_elapsed
(
ensoniq
->
capture_substream
);
if
((
status
&
ES_DAC1
)
&&
ensoniq
->
playback1_substream
)
if
((
status
&
ES_DAC1
)
&&
ensoniq
->
playback1_substream
)
snd_pcm_period_elapsed
(
ensoniq
->
playback1_substream
);
snd_pcm_period_elapsed
(
ensoniq
->
playback1_substream
);
return
IRQ_HANDLED
;
}
}
static
int
__devinit
snd_audiopci_probe
(
struct
pci_dev
*
pci
,
static
int
__devinit
snd_audiopci_probe
(
struct
pci_dev
*
pci
,
...
...
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