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
64ae7d35
Commit
64ae7d35
authored
Nov 25, 2002
by
Alan Cox
Committed by
Linus Torvalds
Nov 25, 2002
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] fix cs46xx build
parent
db8b0101
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
sound/pci/cs46xx/cs46xx_lib.c
sound/pci/cs46xx/cs46xx_lib.c
+4
-1
No files found.
sound/pci/cs46xx/cs46xx_lib.c
View file @
64ae7d35
...
@@ -1027,6 +1027,7 @@ static int snd_cs46xx_capture_trigger(snd_pcm_substream_t * substream,
...
@@ -1027,6 +1027,7 @@ static int snd_cs46xx_capture_trigger(snd_pcm_substream_t * substream,
return
result
;
return
result
;
}
}
#ifdef CONFIG_SND_CS46XX_NEW_DSP
static
int
_cs46xx_adjust_sample_rate
(
cs46xx_t
*
chip
,
cs46xx_pcm_t
*
cpcm
,
static
int
_cs46xx_adjust_sample_rate
(
cs46xx_t
*
chip
,
cs46xx_pcm_t
*
cpcm
,
int
sample_rate
)
int
sample_rate
)
{
{
...
@@ -1055,7 +1056,6 @@ static int _cs46xx_adjust_sample_rate (cs46xx_t *chip, cs46xx_pcm_t *cpcm,
...
@@ -1055,7 +1056,6 @@ static int _cs46xx_adjust_sample_rate (cs46xx_t *chip, cs46xx_pcm_t *cpcm,
cpcm
->
hw_addr
,
cpcm
->
hw_addr
,
cpcm
->
pcm_channel
->
pcm_channel_id
))
==
NULL
)
{
cpcm
->
pcm_channel
->
pcm_channel_id
))
==
NULL
)
{
snd_printk
(
KERN_ERR
"cs46xx: failed to re-create virtual PCM channel
\n
"
);
snd_printk
(
KERN_ERR
"cs46xx: failed to re-create virtual PCM channel
\n
"
);
up
(
&
chip
->
spos_mutex
);
return
-
ENXIO
;
return
-
ENXIO
;
}
}
...
@@ -1065,6 +1065,8 @@ static int _cs46xx_adjust_sample_rate (cs46xx_t *chip, cs46xx_pcm_t *cpcm,
...
@@ -1065,6 +1065,8 @@ static int _cs46xx_adjust_sample_rate (cs46xx_t *chip, cs46xx_pcm_t *cpcm,
return
0
;
return
0
;
}
}
#endif
static
int
snd_cs46xx_playback_hw_params
(
snd_pcm_substream_t
*
substream
,
static
int
snd_cs46xx_playback_hw_params
(
snd_pcm_substream_t
*
substream
,
snd_pcm_hw_params_t
*
hw_params
)
snd_pcm_hw_params_t
*
hw_params
)
{
{
...
@@ -1087,6 +1089,7 @@ static int snd_cs46xx_playback_hw_params(snd_pcm_substream_t * substream,
...
@@ -1087,6 +1089,7 @@ static int snd_cs46xx_playback_hw_params(snd_pcm_substream_t * substream,
if
(
cpcm
->
pcm_channel
->
pcm_channel_id
!=
DSP_IEC958_CHANNEL
||
if
(
cpcm
->
pcm_channel
->
pcm_channel_id
!=
DSP_IEC958_CHANNEL
||
!
(
chip
->
dsp_spos_instance
->
spdif_status_out
&
DSP_SPDIF_STATUS_AC3_MODE
))
{
!
(
chip
->
dsp_spos_instance
->
spdif_status_out
&
DSP_SPDIF_STATUS_AC3_MODE
))
{
if
(
_cs46xx_adjust_sample_rate
(
chip
,
cpcm
,
sample_rate
))
{
if
(
_cs46xx_adjust_sample_rate
(
chip
,
cpcm
,
sample_rate
))
{
up
(
&
chip
->
spos_mutex
);
return
-
ENXIO
;
return
-
ENXIO
;
}
}
}
}
...
...
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