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
71f881ce
Commit
71f881ce
authored
Apr 30, 2015
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'topic/hda' into for-next
parents
85abf3ec
31c648e0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
4 deletions
+1
-4
sound/pci/hda/hda_intel.c
sound/pci/hda/hda_intel.c
+0
-3
sound/pci/hda/hda_intel.h
sound/pci/hda/hda_intel.h
+1
-1
No files found.
sound/pci/hda/hda_intel.c
View file @
71f881ce
...
@@ -1907,8 +1907,6 @@ static int azx_probe_continue(struct azx *chip)
...
@@ -1907,8 +1907,6 @@ static int azx_probe_continue(struct azx *chip)
if
(
pci
->
device
!=
0x0f04
&&
pci
->
device
!=
0x2284
)
if
(
pci
->
device
!=
0x0f04
&&
pci
->
device
!=
0x2284
)
hda
->
need_i915_power
=
1
;
hda
->
need_i915_power
=
1
;
#ifdef CONFIG_SND_HDA_I915
err
=
hda_i915_init
(
hda
);
err
=
hda_i915_init
(
hda
);
if
(
err
<
0
)
if
(
err
<
0
)
goto
i915_power_fail
;
goto
i915_power_fail
;
...
@@ -1919,7 +1917,6 @@ static int azx_probe_continue(struct azx *chip)
...
@@ -1919,7 +1917,6 @@ static int azx_probe_continue(struct azx *chip)
"Cannot turn on display power on i915
\n
"
);
"Cannot turn on display power on i915
\n
"
);
goto
i915_power_fail
;
goto
i915_power_fail
;
}
}
#endif
}
}
err
=
azx_first_init
(
chip
);
err
=
azx_first_init
(
chip
);
...
...
sound/pci/hda/hda_intel.h
View file @
71f881ce
...
@@ -63,7 +63,7 @@ static inline int hda_display_power(struct hda_intel *hda, bool enable)
...
@@ -63,7 +63,7 @@ static inline int hda_display_power(struct hda_intel *hda, bool enable)
static
inline
void
haswell_set_bclk
(
struct
hda_intel
*
hda
)
{
return
;
}
static
inline
void
haswell_set_bclk
(
struct
hda_intel
*
hda
)
{
return
;
}
static
inline
int
hda_i915_init
(
struct
hda_intel
*
hda
)
static
inline
int
hda_i915_init
(
struct
hda_intel
*
hda
)
{
{
return
-
ENODEV
;
return
0
;
}
}
static
inline
int
hda_i915_exit
(
struct
hda_intel
*
hda
)
static
inline
int
hda_i915_exit
(
struct
hda_intel
*
hda
)
{
{
...
...
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