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
4fd23436
Commit
4fd23436
authored
Sep 04, 2008
by
Andi Kleen
Browse files
Options
Browse Files
Download
Plain Diff
Merge branches 'smbus' and 'fujitsu-fix' into release-2.6.27
parents
54cd3148
266feefe
d8196a93
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
0 deletions
+14
-0
drivers/acpi/sbshc.c
drivers/acpi/sbshc.c
+7
-0
drivers/misc/fujitsu-laptop.c
drivers/misc/fujitsu-laptop.c
+7
-0
No files found.
drivers/acpi/sbshc.c
View file @
4fd23436
...
...
@@ -107,6 +107,13 @@ static int wait_transaction_complete(struct acpi_smb_hc *hc, int timeout)
if
(
wait_event_timeout
(
hc
->
wait
,
smb_check_done
(
hc
),
msecs_to_jiffies
(
timeout
)))
return
0
;
/*
* After the timeout happens, OS will try to check the status of SMbus.
* If the status is what OS expected, it will be regarded as the bogus
* timeout.
*/
if
(
smb_check_done
(
hc
))
return
0
;
else
return
-
ETIME
;
}
...
...
drivers/misc/fujitsu-laptop.c
View file @
4fd23436
...
...
@@ -463,6 +463,13 @@ static struct dmi_system_id __initdata fujitsu_dmi_table[] = {
DMI_MATCH
(
DMI_PRODUCT_NAME
,
"LIFEBOOK S6410"
),
},
.
callback
=
dmi_check_cb_s6410
},
{
.
ident
=
"FUJITSU LifeBook P8010"
,
.
matches
=
{
DMI_MATCH
(
DMI_SYS_VENDOR
,
"FUJITSU"
),
DMI_MATCH
(
DMI_PRODUCT_NAME
,
"LifeBook P8010"
),
},
.
callback
=
dmi_check_cb_s6410
},
{}
};
...
...
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