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
e23573d7
Commit
e23573d7
authored
Feb 16, 2009
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/hda' into topic/hda
parents
e2ea57a8
d14a7e0b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
6 deletions
+2
-6
sound/pci/hda/hda_intel.c
sound/pci/hda/hda_intel.c
+2
-6
No files found.
sound/pci/hda/hda_intel.c
View file @
e23573d7
...
@@ -1947,16 +1947,13 @@ static int azx_suspend(struct pci_dev *pci, pm_message_t state)
...
@@ -1947,16 +1947,13 @@ static int azx_suspend(struct pci_dev *pci, pm_message_t state)
return
0
;
return
0
;
}
}
static
int
azx_resume_early
(
struct
pci_dev
*
pci
)
{
return
pci_restore_state
(
pci
);
}
static
int
azx_resume
(
struct
pci_dev
*
pci
)
static
int
azx_resume
(
struct
pci_dev
*
pci
)
{
{
struct
snd_card
*
card
=
pci_get_drvdata
(
pci
);
struct
snd_card
*
card
=
pci_get_drvdata
(
pci
);
struct
azx
*
chip
=
card
->
private_data
;
struct
azx
*
chip
=
card
->
private_data
;
pci_set_power_state
(
pci
,
PCI_D0
);
pci_restore_state
(
pci
);
if
(
pci_enable_device
(
pci
)
<
0
)
{
if
(
pci_enable_device
(
pci
)
<
0
)
{
printk
(
KERN_ERR
"hda-intel: pci_enable_device failed, "
printk
(
KERN_ERR
"hda-intel: pci_enable_device failed, "
"disabling device
\n
"
);
"disabling device
\n
"
);
...
@@ -2480,7 +2477,6 @@ static struct pci_driver driver = {
...
@@ -2480,7 +2477,6 @@ static struct pci_driver driver = {
.
remove
=
__devexit_p
(
azx_remove
),
.
remove
=
__devexit_p
(
azx_remove
),
#ifdef CONFIG_PM
#ifdef CONFIG_PM
.
suspend
=
azx_suspend
,
.
suspend
=
azx_suspend
,
.
resume_early
=
azx_resume_early
,
.
resume
=
azx_resume
,
.
resume
=
azx_resume
,
#endif
#endif
};
};
...
...
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