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
27568d8e
Commit
27568d8e
authored
Jul 22, 2010
by
Len Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bugzilla-16244' into release
parents
855977ef
153e500f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
1 deletion
+7
-1
drivers/acpi/battery.c
drivers/acpi/battery.c
+7
-1
No files found.
drivers/acpi/battery.c
View file @
27568d8e
...
...
@@ -868,9 +868,15 @@ static void acpi_battery_remove_fs(struct acpi_device *device)
static
void
acpi_battery_notify
(
struct
acpi_device
*
device
,
u32
event
)
{
struct
acpi_battery
*
battery
=
acpi_driver_data
(
device
);
#ifdef CONFIG_ACPI_SYSFS_POWER
struct
device
*
old
;
#endif
if
(
!
battery
)
return
;
#ifdef CONFIG_ACPI_SYSFS_POWER
old
=
battery
->
bat
.
dev
;
#endif
acpi_battery_update
(
battery
);
acpi_bus_generate_proc_event
(
device
,
event
,
acpi_battery_present
(
battery
));
...
...
@@ -879,7 +885,7 @@ static void acpi_battery_notify(struct acpi_device *device, u32 event)
acpi_battery_present
(
battery
));
#ifdef CONFIG_ACPI_SYSFS_POWER
/* acpi_battery_update could remove power_supply object */
if
(
battery
->
bat
.
dev
)
if
(
old
&&
battery
->
bat
.
dev
)
power_supply_changed
(
&
battery
->
bat
);
#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