X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=drivers%2Facpi%2Fcontainer.c;h=b69a8cad82b7ca424f3915c1e0eca54e702be08a;hb=1a02e59a2970f9ed28ab51d3b08624b79e54d848;hp=10dd695a1dd93e06d43497b5b4c49ce8680a7cac;hpb=0d9136fdbcdbddcd4eb5ac94c248c039193d4795;p=powerpc.git

diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c
index 10dd695a1d..b69a8cad82 100644
--- a/drivers/acpi/container.c
+++ b/drivers/acpi/container.c
@@ -118,11 +118,9 @@ static int acpi_container_remove(struct acpi_device *device, int type)
 {
 	acpi_status status = AE_OK;
 	struct acpi_container *pc = NULL;
-	pc = (struct acpi_container *)acpi_driver_data(device);
-
-	if (pc)
-		kfree(pc);
 
+	pc = (struct acpi_container *)acpi_driver_data(device);
+	kfree(pc);
 	return status;
 }
 
@@ -174,21 +172,21 @@ static void container_notify_cb(acpi_handle handle, u32 type, void *context)
 			if (ACPI_FAILURE(status) || !device) {
 				result = container_device_add(&device, handle);
 				if (!result)
-					kobject_hotplug(&device->kobj,
-							KOBJ_ONLINE);
+					kobject_uevent(&device->kobj,
+						       KOBJ_ONLINE);
 				else
 					printk("Failed to add container\n");
 			}
 		} else {
 			if (ACPI_SUCCESS(status)) {
 				/* device exist and this is a remove request */
-				kobject_hotplug(&device->kobj, KOBJ_OFFLINE);
+				kobject_uevent(&device->kobj, KOBJ_OFFLINE);
 			}
 		}
 		break;
 	case ACPI_NOTIFY_EJECT_REQUEST:
 		if (!acpi_bus_get_device(handle, &device) && device) {
-			kobject_hotplug(&device->kobj, KOBJ_OFFLINE);
+			kobject_uevent(&device->kobj, KOBJ_OFFLINE);
 		}
 		break;
 	default: