Pull dock-bay into release branch

This commit is contained in:
Len Brown 2007-08-12 00:20:33 -04:00
commit 6712a4fbb1
2 changed files with 4 additions and 4 deletions

View file

@ -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);
}

View file

@ -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