Commit 6712a4fb authored by Len Brown's avatar Len Brown

Pull dock-bay into release branch

parents d8dd3cbc 66b56821
...@@ -337,7 +337,7 @@ static void bay_notify(acpi_handle handle, u32 event, void *data) ...@@ -337,7 +337,7 @@ static void bay_notify(acpi_handle handle, u32 event, void *data)
char *envp[] = { event_string, NULL }; char *envp[] = { event_string, NULL };
bay_dprintk(handle, "Bay event"); 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); kobject_uevent_env(&dev->kobj, KOBJ_CHANGE, envp);
} }
......
...@@ -336,13 +336,13 @@ static void hotplug_dock_devices(struct dock_station *ds, u32 event) ...@@ -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) static void dock_event(struct dock_station *ds, u32 event, int num)
{ {
struct device *dev = &dock_device->dev; struct device *dev = &dock_device->dev;
char event_string[7]; char event_string[13];
char *envp[] = { event_string, NULL }; char *envp[] = { event_string, NULL };
if (num == UNDOCK_EVENT) if (num == UNDOCK_EVENT)
sprintf(event_string, "UNDOCK"); sprintf(event_string, "EVENT=undock");
else else
sprintf(event_string, "DOCK"); sprintf(event_string, "EVENT=dock");
/* /*
* Indicate that the status of the dock station has * Indicate that the status of the dock station has
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment