Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Pull dock-bay into release branch

parents d8dd3cbc 66b56821

drivers/acpi/bay.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

drivers/acpi/dock.c

+3 −3
Original line number Diff line number Diff line
@@ -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