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
3409fcd1
Commit
3409fcd1
authored
Jun 17, 2011
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/hda' into topic/misc
parents
f4b1e98a
ad240941
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
8 deletions
+12
-8
sound/firewire/isight.c
sound/firewire/isight.c
+1
-0
sound/pci/hda/hda_beep.h
sound/pci/hda/hda_beep.h
+1
-1
sound/pci/hda/patch_via.c
sound/pci/hda/patch_via.c
+7
-4
sound/pci/lola/lola.c
sound/pci/lola/lola.c
+1
-1
sound/usb/6fire/pcm.c
sound/usb/6fire/pcm.c
+2
-2
No files found.
sound/firewire/isight.c
View file @
3409fcd1
...
...
@@ -209,6 +209,7 @@ static void isight_packet(struct fw_iso_context *context, u32 cycle,
isight
->
packet_index
=
-
1
;
return
;
}
fw_iso_context_queue_flush
(
isight
->
context
);
if
(
++
index
>=
QUEUE_LENGTH
)
index
=
0
;
...
...
sound/pci/hda/hda_beep.h
View file @
3409fcd1
...
...
@@ -54,7 +54,7 @@ static inline int snd_hda_attach_beep_device(struct hda_codec *codec, int nid)
{
return
0
;
}
void
snd_hda_detach_beep_device
(
struct
hda_codec
*
codec
)
static
inline
void
snd_hda_detach_beep_device
(
struct
hda_codec
*
codec
)
{
}
#endif
...
...
sound/pci/hda/patch_via.c
View file @
3409fcd1
...
...
@@ -832,10 +832,13 @@ static int via_hp_build(struct hda_codec *codec)
knew
->
subdevice
=
HDA_SUBDEV_NID_FLAG
|
nid
;
knew
->
private_value
=
nid
;
knew
=
via_clone_control
(
spec
,
&
via_hp_mixer
[
1
]);
if
(
knew
==
NULL
)
return
-
ENOMEM
;
knew
->
subdevice
=
side_mute_channel
(
spec
);
nid
=
side_mute_channel
(
spec
);
if
(
nid
)
{
knew
=
via_clone_control
(
spec
,
&
via_hp_mixer
[
1
]);
if
(
knew
==
NULL
)
return
-
ENOMEM
;
knew
->
subdevice
=
nid
;
}
return
0
;
}
...
...
sound/pci/lola/lola.c
View file @
3409fcd1
...
...
@@ -445,7 +445,7 @@ static void lola_reset_setups(struct lola *chip)
lola_setup_all_analog_gains
(
chip
,
PLAY
,
false
);
/* output, update */
}
static
int
lola_parse_tree
(
struct
lola
*
chip
)
static
int
__devinit
lola_parse_tree
(
struct
lola
*
chip
)
{
unsigned
int
val
;
int
nid
,
err
;
...
...
sound/usb/6fire/pcm.c
View file @
3409fcd1
...
...
@@ -395,12 +395,12 @@ static int usb6fire_pcm_open(struct snd_pcm_substream *alsa_sub)
alsa_rt
->
hw
=
pcm_hw
;
if
(
alsa_sub
->
stream
==
SNDRV_PCM_STREAM_PLAYBACK
)
{
if
(
rt
->
rate
>=
0
)
if
(
rt
->
rate
<
ARRAY_SIZE
(
rates
)
)
alsa_rt
->
hw
.
rates
=
rates_alsaid
[
rt
->
rate
];
alsa_rt
->
hw
.
channels_max
=
OUT_N_CHANNELS
;
sub
=
&
rt
->
playback
;
}
else
if
(
alsa_sub
->
stream
==
SNDRV_PCM_STREAM_CAPTURE
)
{
if
(
rt
->
rate
>=
0
)
if
(
rt
->
rate
<
ARRAY_SIZE
(
rates
)
)
alsa_rt
->
hw
.
rates
=
rates_alsaid
[
rt
->
rate
];
alsa_rt
->
hw
.
channels_max
=
IN_N_CHANNELS
;
sub
=
&
rt
->
capture
;
...
...
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