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
308b892c
Commit
308b892c
authored
Feb 25, 2009
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/hda' into for-linus
parents
20f4d6c3
cc374c47
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
7 deletions
+11
-7
sound/pci/hda/hda_hwdep.c
sound/pci/hda/hda_hwdep.c
+8
-7
sound/pci/hda/patch_realtek.c
sound/pci/hda/patch_realtek.c
+3
-0
No files found.
sound/pci/hda/hda_hwdep.c
View file @
308b892c
...
...
@@ -277,18 +277,19 @@ static ssize_t init_verbs_store(struct device *dev,
{
struct
snd_hwdep
*
hwdep
=
dev_get_drvdata
(
dev
);
struct
hda_codec
*
codec
=
hwdep
->
private_data
;
char
*
p
;
struct
hda_verb
verb
,
*
v
;
struct
hda_verb
*
v
;
int
nid
,
verb
,
param
;
verb
.
nid
=
simple_strtoul
(
buf
,
&
p
,
0
);
verb
.
verb
=
simple_strtoul
(
p
,
&
p
,
0
);
verb
.
param
=
simple_strtoul
(
p
,
&
p
,
0
);
if
(
!
verb
.
nid
||
!
verb
.
verb
||
!
verb
.
param
)
if
(
sscanf
(
buf
,
"%i %i %i"
,
&
nid
,
&
verb
,
&
param
)
!=
3
)
return
-
EINVAL
;
if
(
!
nid
||
!
verb
)
return
-
EINVAL
;
v
=
snd_array_new
(
&
codec
->
init_verbs
);
if
(
!
v
)
return
-
ENOMEM
;
*
v
=
verb
;
v
->
nid
=
nid
;
v
->
verb
=
verb
;
v
->
param
=
param
;
return
count
;
}
...
...
sound/pci/hda/patch_realtek.c
View file @
308b892c
...
...
@@ -7017,6 +7017,7 @@ static int patch_alc882(struct hda_codec *codec)
case
0x106b3e00
:
/* iMac 24 Aluminium */
board_config
=
ALC885_IMAC24
;
break
;
case
0x106b00a0
:
/* MacBookPro3,1 - Another revision */
case
0x106b00a1
:
/* Macbook (might be wrong - PCI SSID?) */
case
0x106b00a4
:
/* MacbookPro4,1 */
case
0x106b2c00
:
/* Macbook Pro rev3 */
...
...
@@ -8469,6 +8470,8 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = {
ALC888_ACER_ASPIRE_4930G
),
SND_PCI_QUIRK
(
0x1025
,
0x015e
,
"Acer Aspire 6930G"
,
ALC888_ACER_ASPIRE_4930G
),
SND_PCI_QUIRK
(
0x1025
,
0x0166
,
"Acer Aspire 6530G"
,
ALC888_ACER_ASPIRE_4930G
),
SND_PCI_QUIRK
(
0x1025
,
0
,
"Acer laptop"
,
ALC883_ACER
),
/* default Acer */
SND_PCI_QUIRK
(
0x1028
,
0x020d
,
"Dell Inspiron 530"
,
ALC888_6ST_DELL
),
SND_PCI_QUIRK
(
0x103c
,
0x2a3d
,
"HP Pavillion"
,
ALC883_6ST_DIG
),
...
...
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