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
e2eaf3d4
Commit
e2eaf3d4
authored
Jul 24, 2002
by
Alan Cox
Committed by
Linus Torvalds
Jul 24, 2002
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] fix ALSA PCI compile problems
parent
ba877295
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
16 additions
and
11 deletions
+16
-11
sound/pci/ali5451/ali5451.c
sound/pci/ali5451/ali5451.c
+2
-2
sound/pci/cmipci.c
sound/pci/cmipci.c
+1
-1
sound/pci/cs4281.c
sound/pci/cs4281.c
+3
-2
sound/pci/maestro3.c
sound/pci/maestro3.c
+2
-1
sound/pci/nm256/nm256.c
sound/pci/nm256/nm256.c
+2
-1
sound/pci/via686.c
sound/pci/via686.c
+3
-2
sound/pci/via8233.c
sound/pci/via8233.c
+3
-2
No files found.
sound/pci/ali5451/ali5451.c
View file @
e2eaf3d4
...
@@ -1968,7 +1968,7 @@ static void snd_ali_resume(struct pci_dev *dev)
...
@@ -1968,7 +1968,7 @@ static void snd_ali_resume(struct pci_dev *dev)
static
int
snd_ali_free
(
ali_t
*
codec
)
static
int
snd_ali_free
(
ali_t
*
codec
)
{
{
snd_ali_disable_address_interrupt
(
codec
);
snd_ali_disable_address_interrupt
(
codec
);
synchronize_irq
();
synchronize_irq
(
codec
->
irq
);
if
(
codec
->
irq
>=
0
)
if
(
codec
->
irq
>=
0
)
free_irq
(
codec
->
irq
,
(
void
*
)
codec
);
free_irq
(
codec
->
irq
,
(
void
*
)
codec
);
if
(
codec
->
res_port
)
{
if
(
codec
->
res_port
)
{
...
@@ -2116,7 +2116,7 @@ static int __devinit snd_ali_create(snd_card_t * card,
...
@@ -2116,7 +2116,7 @@ static int __devinit snd_ali_create(snd_card_t * card,
return
-
EBUSY
;
return
-
EBUSY
;
}
}
synchronize_irq
();
synchronize_irq
(
pci
->
irq
);
codec
->
synth
.
chmap
=
0
;
codec
->
synth
.
chmap
=
0
;
codec
->
synth
.
chcnt
=
0
;
codec
->
synth
.
chcnt
=
0
;
...
...
sound/pci/cmipci.c
View file @
e2eaf3d4
...
@@ -2479,7 +2479,7 @@ static int snd_cmipci_free(cmipci_t *cm)
...
@@ -2479,7 +2479,7 @@ static int snd_cmipci_free(cmipci_t *cm)
/* reset mixer */
/* reset mixer */
snd_cmipci_mixer_write
(
cm
,
0
,
0
);
snd_cmipci_mixer_write
(
cm
,
0
,
0
);
synchronize_irq
();
synchronize_irq
(
cm
->
irq
);
free_irq
(
cm
->
irq
,
(
void
*
)
cm
);
free_irq
(
cm
->
irq
,
(
void
*
)
cm
);
}
}
...
...
sound/pci/cs4281.c
View file @
e2eaf3d4
...
@@ -1300,7 +1300,8 @@ static int snd_cs4281_free(cs4281_t *chip)
...
@@ -1300,7 +1300,8 @@ static int snd_cs4281_free(cs4281_t *chip)
}
}
#endif
#endif
snd_cs4281_proc_done
(
chip
);
snd_cs4281_proc_done
(
chip
);
synchronize_irq
();
if
(
chip
->
irq
>=
0
)
synchronize_irq
(
chip
->
irq
);
/* Mask interrupts */
/* Mask interrupts */
snd_cs4281_pokeBA0
(
chip
,
BA0_HIMR
,
0x7fffffff
);
snd_cs4281_pokeBA0
(
chip
,
BA0_HIMR
,
0x7fffffff
);
...
@@ -1603,7 +1604,7 @@ static int __devinit snd_cs4281_create(snd_card_t * card,
...
@@ -1603,7 +1604,7 @@ static int __devinit snd_cs4281_create(snd_card_t * card,
BA0_HISR_DMA
(
1
)
|
BA0_HISR_DMA
(
1
)
|
BA0_HISR_DMA
(
2
)
|
BA0_HISR_DMA
(
2
)
|
BA0_HISR_DMA
(
3
)));
BA0_HISR_DMA
(
3
)));
synchronize_irq
();
synchronize_irq
(
chip
->
irq
);
if
((
err
=
snd_device_new
(
card
,
SNDRV_DEV_LOWLEVEL
,
chip
,
&
ops
))
<
0
)
{
if
((
err
=
snd_device_new
(
card
,
SNDRV_DEV_LOWLEVEL
,
chip
,
&
ops
))
<
0
)
{
snd_cs4281_free
(
chip
);
snd_cs4281_free
(
chip
);
...
...
sound/pci/maestro3.c
View file @
e2eaf3d4
...
@@ -2310,7 +2310,8 @@ static int snd_m3_free(m3_t *chip)
...
@@ -2310,7 +2310,8 @@ static int snd_m3_free(m3_t *chip)
vfree
(
chip
->
suspend_mem
);
vfree
(
chip
->
suspend_mem
);
#endif
#endif
synchronize_irq
();
if
(
chip
->
irq
>=
0
)
synchronize_irq
(
chip
->
irq
);
if
(
chip
->
iobase_res
)
{
if
(
chip
->
iobase_res
)
{
release_resource
(
chip
->
iobase_res
);
release_resource
(
chip
->
iobase_res
);
...
...
sound/pci/nm256/nm256.c
View file @
e2eaf3d4
...
@@ -1346,7 +1346,8 @@ static int snd_nm256_free(nm256_t *chip)
...
@@ -1346,7 +1346,8 @@ static int snd_nm256_free(nm256_t *chip)
if
(
chip
->
streams
[
SNDRV_PCM_STREAM_CAPTURE
].
running
)
if
(
chip
->
streams
[
SNDRV_PCM_STREAM_CAPTURE
].
running
)
snd_nm256_capture_stop
(
chip
);
snd_nm256_capture_stop
(
chip
);
synchronize_irq
();
if
(
chip
->
irq
>=
0
)
synchronize_irq
(
chip
->
irq
);
if
(
chip
->
cport
)
if
(
chip
->
cport
)
iounmap
((
void
*
)
chip
->
cport
);
iounmap
((
void
*
)
chip
->
cport
);
...
...
sound/pci/via686.c
View file @
e2eaf3d4
...
@@ -993,7 +993,8 @@ static int snd_via686a_free(via686a_t *chip)
...
@@ -993,7 +993,8 @@ static int snd_via686a_free(via686a_t *chip)
snd_via686a_channel_reset
(
chip
,
&
chip
->
playback_fm
);
snd_via686a_channel_reset
(
chip
,
&
chip
->
playback_fm
);
/* --- */
/* --- */
__end_hw:
__end_hw:
synchronize_irq
();
if
(
chip
->
irq
>=
0
)
synchronize_irq
(
chip
->
irq
);
if
(
chip
->
tables
)
if
(
chip
->
tables
)
snd_free_pci_pages
(
chip
->
pci
,
3
*
sizeof
(
unsigned
int
)
*
VIA_MAX_FRAGS
*
2
,
chip
->
tables
,
chip
->
tables_addr
);
snd_free_pci_pages
(
chip
->
pci
,
3
*
sizeof
(
unsigned
int
)
*
VIA_MAX_FRAGS
*
2
,
chip
->
tables
,
chip
->
tables_addr
);
if
(
chip
->
res_port
)
{
if
(
chip
->
res_port
)
{
...
@@ -1055,7 +1056,7 @@ static int __devinit snd_via686a_create(snd_card_t * card,
...
@@ -1055,7 +1056,7 @@ static int __devinit snd_via686a_create(snd_card_t * card,
if
(
ac97_clock
>=
8000
&&
ac97_clock
<=
48000
)
if
(
ac97_clock
>=
8000
&&
ac97_clock
<=
48000
)
chip
->
ac97_clock
=
ac97_clock
;
chip
->
ac97_clock
=
ac97_clock
;
pci_read_config_byte
(
pci
,
PCI_REVISION_ID
,
&
chip
->
revision
);
pci_read_config_byte
(
pci
,
PCI_REVISION_ID
,
&
chip
->
revision
);
synchronize_irq
();
synchronize_irq
(
pci
->
irq
);
/* initialize offsets */
/* initialize offsets */
chip
->
playback
.
reg_offset
=
VIA_REG_PLAYBACK_STATUS
;
chip
->
playback
.
reg_offset
=
VIA_REG_PLAYBACK_STATUS
;
...
...
sound/pci/via8233.c
View file @
e2eaf3d4
...
@@ -759,7 +759,8 @@ static int snd_via8233_free(via8233_t *chip)
...
@@ -759,7 +759,8 @@ static int snd_via8233_free(via8233_t *chip)
snd_via8233_channel_reset
(
chip
,
&
chip
->
capture
);
snd_via8233_channel_reset
(
chip
,
&
chip
->
capture
);
/* --- */
/* --- */
__end_hw:
__end_hw:
synchronize_irq
();
if
(
chip
->
irq
)
synchronize_irq
(
chip
->
irq
);
if
(
chip
->
tables
)
if
(
chip
->
tables
)
snd_free_pci_pages
(
chip
->
pci
,
snd_free_pci_pages
(
chip
->
pci
,
VIA_NUM_OF_DMA_CHANNELS
*
sizeof
(
unsigned
int
)
*
VIA_MAX_FRAGS
*
2
,
VIA_NUM_OF_DMA_CHANNELS
*
sizeof
(
unsigned
int
)
*
VIA_MAX_FRAGS
*
2
,
...
@@ -817,7 +818,7 @@ static int __devinit snd_via8233_create(snd_card_t * card,
...
@@ -817,7 +818,7 @@ static int __devinit snd_via8233_create(snd_card_t * card,
if
(
ac97_clock
>=
8000
&&
ac97_clock
<=
48000
)
if
(
ac97_clock
>=
8000
&&
ac97_clock
<=
48000
)
chip
->
ac97_clock
=
ac97_clock
;
chip
->
ac97_clock
=
ac97_clock
;
pci_read_config_byte
(
pci
,
PCI_REVISION_ID
,
&
chip
->
revision
);
pci_read_config_byte
(
pci
,
PCI_REVISION_ID
,
&
chip
->
revision
);
synchronize_irq
();
synchronize_irq
(
chip
->
irq
);
/* initialize offsets */
/* initialize offsets */
#if 0
#if 0
...
...
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