Merge branch 'linus' into x86/pebs

1 files changed, 10 insertions, 6 deletions

diff --git a/drivers/acpi/bay.c b/drivers/acpi/bay.c
index d2fc94161848..26038c2a2a71 100644
--- a/drivers/acpi/bay.c
+++ b/drivers/acpi/bay.c
@@ -301,16 +301,20 @@ static int bay_add(acpi_handle handle, int id)
          */
         pdev->dev.uevent_suppress = 0;
 
-        if (acpi_bay_add_fs(new_bay)) {
-                platform_device_unregister(new_bay->pdev);
-                goto bay_add_err;
-        }
-
         /* register for events on this device */
         status = acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY,
                         bay_notify, new_bay);
         if (ACPI_FAILURE(status)) {
-                printk(KERN_ERR PREFIX "Error installing bay notify handler\n");
+                printk(KERN_INFO PREFIX "Error installing bay notify handler\n");
+                platform_device_unregister(new_bay->pdev);
+                goto bay_add_err;
+        }
+
+        if (acpi_bay_add_fs(new_bay)) {
+                acpi_remove_notify_handler(handle, ACPI_SYSTEM_NOTIFY,
+                                           bay_notify);
+                platform_device_unregister(new_bay->pdev);
+                goto bay_add_err;
         }
 
         /* if we are on a dock station, we should register for dock