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
d47b180c
Commit
d47b180c
authored
Feb 09, 2008
by
Len Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branches 'release' and 'bugzilla-9910' into release
parents
249d621a
bbafbecb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
2 deletions
+8
-2
drivers/acpi/Makefile
drivers/acpi/Makefile
+1
-1
drivers/acpi/sbs.c
drivers/acpi/sbs.c
+1
-1
drivers/acpi/sbshc.c
drivers/acpi/sbshc.c
+6
-0
No files found.
drivers/acpi/Makefile
View file @
d47b180c
...
@@ -60,5 +60,5 @@ obj-$(CONFIG_ACPI_ASUS) += asus_acpi.o
...
@@ -60,5 +60,5 @@ obj-$(CONFIG_ACPI_ASUS) += asus_acpi.o
obj-$(CONFIG_ACPI_TOSHIBA)
+=
toshiba_acpi.o
obj-$(CONFIG_ACPI_TOSHIBA)
+=
toshiba_acpi.o
obj-$(CONFIG_ACPI_HOTPLUG_MEMORY)
+=
acpi_memhotplug.o
obj-$(CONFIG_ACPI_HOTPLUG_MEMORY)
+=
acpi_memhotplug.o
obj-$(CONFIG_ACPI_PROCFS_POWER)
+=
cm_sbs.o
obj-$(CONFIG_ACPI_PROCFS_POWER)
+=
cm_sbs.o
obj-$(CONFIG_ACPI_SBS)
+=
sbs.o
obj-$(CONFIG_ACPI_SBS)
+=
sbshc.o
obj-$(CONFIG_ACPI_SBS)
+=
sbshc.o
obj-$(CONFIG_ACPI_SBS)
+=
sbs.o
drivers/acpi/sbs.c
View file @
d47b180c
...
@@ -827,7 +827,7 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id)
...
@@ -827,7 +827,7 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id)
#endif
#endif
printk
(
KERN_INFO
PREFIX
"%s [%s]: Battery Slot [%s] (battery %s)
\n
"
,
printk
(
KERN_INFO
PREFIX
"%s [%s]: Battery Slot [%s] (battery %s)
\n
"
,
ACPI_SBS_DEVICE_NAME
,
acpi_device_bid
(
sbs
->
device
),
ACPI_SBS_DEVICE_NAME
,
acpi_device_bid
(
sbs
->
device
),
battery
->
name
,
sbs
->
battery
->
present
?
"present"
:
"absent"
);
battery
->
name
,
battery
->
present
?
"present"
:
"absent"
);
return
result
;
return
result
;
}
}
...
...
drivers/acpi/sbshc.c
View file @
d47b180c
...
@@ -117,6 +117,11 @@ static int acpi_smbus_transaction(struct acpi_smb_hc *hc, u8 protocol,
...
@@ -117,6 +117,11 @@ static int acpi_smbus_transaction(struct acpi_smb_hc *hc, u8 protocol,
int
ret
=
-
EFAULT
,
i
;
int
ret
=
-
EFAULT
,
i
;
u8
temp
,
sz
=
0
;
u8
temp
,
sz
=
0
;
if
(
!
hc
)
{
printk
(
KERN_ERR
PREFIX
"host controller is not configured
\n
"
);
return
ret
;
}
mutex_lock
(
&
hc
->
lock
);
mutex_lock
(
&
hc
->
lock
);
if
(
smb_hc_read
(
hc
,
ACPI_SMB_PROTOCOL
,
&
temp
))
if
(
smb_hc_read
(
hc
,
ACPI_SMB_PROTOCOL
,
&
temp
))
goto
end
;
goto
end
;
...
@@ -292,6 +297,7 @@ static int acpi_smbus_hc_remove(struct acpi_device *device, int type)
...
@@ -292,6 +297,7 @@ static int acpi_smbus_hc_remove(struct acpi_device *device, int type)
hc
=
acpi_driver_data
(
device
);
hc
=
acpi_driver_data
(
device
);
acpi_ec_remove_query_handler
(
hc
->
ec
,
hc
->
query_bit
);
acpi_ec_remove_query_handler
(
hc
->
ec
,
hc
->
query_bit
);
kfree
(
hc
);
kfree
(
hc
);
acpi_driver_data
(
device
)
=
NULL
;
return
0
;
return
0
;
}
}
...
...
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