2 files changed, 20 insertions, 7 deletions

diff --git a/drivers/misc/asus-laptop.c b/drivers/misc/asus-laptop.c
index f8ae58f01637..7dce318df1bd 100644
--- a/drivers/misc/asus-laptop.c
+++ b/drivers/misc/asus-laptop.c
@@ -1072,7 +1072,8 @@ static void asus_backlight_exit(void)
 }
 
 #define  ASUS_LED_UNREGISTER(object)                            \
-        led_classdev_unregister(&object##_led)
+        if (object##_led.dev)                                   \
+                led_classdev_unregister(&object##_led)
 
 static void asus_led_exit(void)
 {
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
index 743bd49ae6f5..d38ddce592c0 100644
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
@@ -856,6 +856,15 @@ static struct dmi_system_id sony_nc_ids[] = {
                         },
                 },
                 {
+                        .ident = "Sony Vaio FZ Series",
+                        .callback = sony_nc_C_enable,
+                        .driver_data = sony_C_events,
+                        .matches = {
+                                DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+                                DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FZ"),
+                        },
+                },
+                {
                         .ident = "Sony Vaio C Series",
                         .callback = sony_nc_C_enable,
                         .driver_data = sony_C_events,
@@ -2308,8 +2317,6 @@ static int sony_pic_remove(struct acpi_device *device, int type)
         struct sony_pic_ioport *io, *tmp_io;
         struct sony_pic_irq *irq, *tmp_irq;
 
-        sonypi_compat_exit();
-
         if (sony_pic_disable(device)) {
                 printk(KERN_ERR DRV_PFX "Couldn't disable device.\n");
                 return -ENXIO;
@@ -2319,6 +2326,8 @@ static int sony_pic_remove(struct acpi_device *device, int type)
         release_region(spic_dev.cur_ioport->io.minimum,
                         spic_dev.cur_ioport->io.address_length);
 
+        sonypi_compat_exit();
+
         sony_laptop_remove_input();
 
         /* pf attrs */
@@ -2384,6 +2393,9 @@ static int sony_pic_add(struct acpi_device *device)
                 goto err_free_resources;
         }
 
+        if (sonypi_compat_init())
+                goto err_remove_input;
+
         /* request io port */
         list_for_each_entry(io, &spic_dev.ioports, list) {
                 if (request_region(io->io.minimum, io->io.address_length,
@@ -2398,7 +2410,7 @@ static int sony_pic_add(struct acpi_device *device)
         if (!spic_dev.cur_ioport) {
                 printk(KERN_ERR DRV_PFX "Failed to request_region.\n");
                 result = -ENODEV;
-                goto err_remove_input;
+                goto err_remove_compat;
         }
 
         /* request IRQ */
@@ -2438,9 +2450,6 @@ static int sony_pic_add(struct acpi_device *device)
         if (result)
                 goto err_remove_pf;
 
-        if (sonypi_compat_init())
-                goto err_remove_pf;
-
         return 0;
 
 err_remove_pf:
@@ -2456,6 +2465,9 @@ err_release_region:
         release_region(spic_dev.cur_ioport->io.minimum,
                         spic_dev.cur_ioport->io.address_length);
 
+err_remove_compat:
+        sonypi_compat_exit();
+
 err_remove_input:
         sony_laptop_remove_input();