Merge branch 'upstream'

[pandora-kernel.git] / drivers / acpi / container.c

diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c
index 10dd695..b69a8ca 100644 (file)
--- 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: