aboutsummaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-08-12 00:20:33 -0400
committerLen Brown <len.brown@intel.com>2007-08-12 00:20:33 -0400
commit6712a4fbb14a466d259e53a5314d8011ecab3d7b (patch)
tree5409e5f9be6099f7aff40400071385e61930585d /drivers/acpi
parentd8dd3cbcf1b30c315a28f65cb719bb2d7105a317 (diff)
parent66b568218ab73be161dc109b913e6fa7dda44e16 (diff)
Pull dock-bay into release branch
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/bay.c2
-rw-r--r--drivers/acpi/dock.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/bay.c b/drivers/acpi/bay.c
index 56a5b3fffeb..6daf6088ac8 100644
--- a/drivers/acpi/bay.c
+++ b/drivers/acpi/bay.c
@@ -337,7 +337,7 @@ static void bay_notify(acpi_handle handle, u32 event, void *data)
char *envp[] = { event_string, NULL };
bay_dprintk(handle, "Bay event");
- sprintf(event_string, "BAY_EVENT=%d\n", event);
+ sprintf(event_string, "BAY_EVENT=%d", event);
kobject_uevent_env(&dev->kobj, KOBJ_CHANGE, envp);
}
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 6192c8be66d..1dabdf4c07b 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -336,13 +336,13 @@ static void hotplug_dock_devices(struct dock_station *ds, u32 event)
static void dock_event(struct dock_station *ds, u32 event, int num)
{
struct device *dev = &dock_device->dev;
- char event_string[7];
+ char event_string[13];
char *envp[] = { event_string, NULL };
if (num == UNDOCK_EVENT)
- sprintf(event_string, "UNDOCK");
+ sprintf(event_string, "EVENT=undock");
else
- sprintf(event_string, "DOCK");
+ sprintf(event_string, "EVENT=dock");
/*
* Indicate that the status of the dock station has