Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
69b5de84
Commit
69b5de84
authored
May 05, 2010
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/hda' into for-linus
parents
bfe70783
8f0f5ff6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
sound/pci/hda/patch_cirrus.c
sound/pci/hda/patch_cirrus.c
+1
-1
sound/pci/hda/patch_conexant.c
sound/pci/hda/patch_conexant.c
+6
-2
No files found.
sound/pci/hda/patch_cirrus.c
View file @
69b5de84
...
...
@@ -766,7 +766,7 @@ static int build_input(struct hda_codec *codec)
for
(
n
=
0
;
n
<
AUTO_PIN_LAST
;
n
++
)
{
if
(
!
spec
->
adc_nid
[
n
])
continue
;
err
=
snd_hda_add_nid
(
codec
,
kctl
,
0
,
spec
->
adc_nid
[
i
]);
err
=
snd_hda_add_nid
(
codec
,
kctl
,
0
,
spec
->
adc_nid
[
n
]);
if
(
err
<
0
)
return
err
;
}
...
...
sound/pci/hda/patch_conexant.c
View file @
69b5de84
...
...
@@ -1195,9 +1195,10 @@ static int patch_cxt5045(struct hda_codec *codec)
switch
(
codec
->
subsystem_id
>>
16
)
{
case
0x103c
:
case
0x1631
:
case
0x1734
:
/* HP
& Fujitsu-Siemens laptops have really bad sound over 0dB
* on NID 0x17. Fix max PCM level to 0 dB
/* HP
, Packard Bell, & Fujitsu-Siemens laptops have really bad
*
sound over 0dB
on NID 0x17. Fix max PCM level to 0 dB
* (originally it has 0x2b steps with 0dB offset 0x14)
*/
snd_hda_override_amp_caps
(
codec
,
0x17
,
HDA_INPUT
,
...
...
@@ -2842,6 +2843,9 @@ static struct snd_pci_quirk cxt5066_cfg_tbl[] = {
CXT5066_DELL_LAPTOP
),
SND_PCI_QUIRK
(
0x152d
,
0x0833
,
"OLPC XO-1.5"
,
CXT5066_OLPC_XO_1_5
),
SND_PCI_QUIRK
(
0x1028
,
0x0402
,
"Dell Vostro"
,
CXT5066_DELL_VOSTO
),
SND_PCI_QUIRK
(
0x1028
,
0x0408
,
"Dell Inspiron One 19T"
,
CXT5066_IDEAPAD
),
SND_PCI_QUIRK
(
0x1179
,
0xff50
,
"Toshiba Satellite P500-PSPGSC-01800T"
,
CXT5066_OLPC_XO_1_5
),
SND_PCI_QUIRK
(
0x1179
,
0xffe0
,
"Toshiba Satellite Pro T130-15F"
,
CXT5066_OLPC_XO_1_5
),
SND_PCI_QUIRK
(
0x17aa
,
0x3a0d
,
"ideapad"
,
CXT5066_IDEAPAD
),
{}
};
...
...
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