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
607ace4b
Commit
607ace4b
authored
Apr 20, 2003
by
David S. Miller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SOUND TRIDENT]: Update for irqreturn_t.
parent
d466e157
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
sound/pci/trident/trident_main.c
sound/pci/trident/trident_main.c
+6
-4
No files found.
sound/pci/trident/trident_main.c
View file @
607ace4b
...
...
@@ -48,7 +48,7 @@
static
int
snd_trident_pcm_mixer_build
(
trident_t
*
trident
,
snd_trident_voice_t
*
voice
,
snd_pcm_substream_t
*
substream
);
static
int
snd_trident_pcm_mixer_free
(
trident_t
*
trident
,
snd_trident_voice_t
*
voice
,
snd_pcm_substream_t
*
substream
);
static
void
snd_trident_interrupt
(
int
irq
,
void
*
dev_id
,
struct
pt_regs
*
regs
);
static
irqreturn_t
snd_trident_interrupt
(
int
irq
,
void
*
dev_id
,
struct
pt_regs
*
regs
);
#ifdef CONFIG_PM
static
int
snd_trident_set_power_state
(
snd_card_t
*
card
,
unsigned
int
power_state
);
#endif
...
...
@@ -3683,11 +3683,11 @@ int snd_trident_free(trident_t *trident)
the method try & fail so it is possible that it won't
work on all computers. [jaroslav]
Returns:
None
.
Returns:
Whether IRQ was handled or not
.
---------------------------------------------------------------------------*/
static
void
snd_trident_interrupt
(
int
irq
,
void
*
dev_id
,
struct
pt_regs
*
regs
)
static
irqreturn_t
snd_trident_interrupt
(
int
irq
,
void
*
dev_id
,
struct
pt_regs
*
regs
)
{
trident_t
*
trident
=
snd_magic_cast
(
trident_t
,
dev_id
,
return
);
unsigned
int
audio_int
,
chn_int
,
stimer
,
channel
,
mask
,
tmp
;
...
...
@@ -3696,7 +3696,7 @@ static void snd_trident_interrupt(int irq, void *dev_id, struct pt_regs *regs)
audio_int
=
inl
(
TRID_REG
(
trident
,
T4D_MISCINT
));
if
((
audio_int
&
(
ADDRESS_IRQ
|
MPU401_IRQ
))
==
0
)
return
;
return
IRQ_NONE
;
if
(
audio_int
&
ADDRESS_IRQ
)
{
// get interrupt status for all channels
spin_lock
(
&
trident
->
reg_lock
);
...
...
@@ -3781,6 +3781,8 @@ static void snd_trident_interrupt(int irq, void *dev_id, struct pt_regs *regs)
}
}
// outl((ST_TARGET_REACHED | MIXER_OVERFLOW | MIXER_UNDERFLOW), TRID_REG(trident, T4D_MISCINT));
return
IRQ_HANDLED
;
}
/*---------------------------------------------------------------------------
...
...
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