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
e911d27a
Commit
e911d27a
authored
Nov 11, 2008
by
Len Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bugzilla-11917' into release
parents
50f19e37
d21cf3c1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
drivers/acpi/ec.c
drivers/acpi/ec.c
+2
-1
No files found.
drivers/acpi/ec.c
View file @
e911d27a
...
@@ -736,7 +736,7 @@ static acpi_status
...
@@ -736,7 +736,7 @@ static acpi_status
ec_parse_device
(
acpi_handle
handle
,
u32
Level
,
void
*
context
,
void
**
retval
)
ec_parse_device
(
acpi_handle
handle
,
u32
Level
,
void
*
context
,
void
**
retval
)
{
{
acpi_status
status
;
acpi_status
status
;
unsigned
long
long
tmp
;
unsigned
long
long
tmp
=
0
;
struct
acpi_ec
*
ec
=
context
;
struct
acpi_ec
*
ec
=
context
;
status
=
acpi_walk_resources
(
handle
,
METHOD_NAME__CRS
,
status
=
acpi_walk_resources
(
handle
,
METHOD_NAME__CRS
,
...
@@ -751,6 +751,7 @@ ec_parse_device(acpi_handle handle, u32 Level, void *context, void **retval)
...
@@ -751,6 +751,7 @@ ec_parse_device(acpi_handle handle, u32 Level, void *context, void **retval)
return
status
;
return
status
;
ec
->
gpe
=
tmp
;
ec
->
gpe
=
tmp
;
/* Use the global lock for all EC transactions? */
/* Use the global lock for all EC transactions? */
tmp
=
0
;
acpi_evaluate_integer
(
handle
,
"_GLK"
,
NULL
,
&
tmp
);
acpi_evaluate_integer
(
handle
,
"_GLK"
,
NULL
,
&
tmp
);
ec
->
global_lock
=
tmp
;
ec
->
global_lock
=
tmp
;
ec
->
handle
=
handle
;
ec
->
handle
=
handle
;
...
...
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