From ba2833d56763a5de6a0e10ea21fcf88f9bd5cb12 Mon Sep 17 00:00:00 2001
From: Mattia Dongili <malattia@linux.it>
Date: Sat, 4 Aug 2007 00:22:30 +0900
Subject: [PATCH] --- yaml --- r: 63935 b: refs/heads/master c:
 e84a02ba0b33a97a8486f3248fd45f50b1a1c014 h: refs/heads/master i:   63933:
 5a40c5846bba59270f06758f0f9ae3aa94224dd4   63931:
 8b1f83870e7fcd26d92183648b25f7501b6248a2   63927:
 855ac971ef6f9ef888eef5eb770e5a02666d9136   63919:
 a1a619784af1b3780cf99d8b19544ccab47a2fcd   63903:
 8056f58a55121b5e92b25de2e51aeba8dbd0aac4   63871:
 831dcce061f8b6f231dba3e6dd5b74ac8796b9a1 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/acpi/asus_acpi.c   | 1 -
 trunk/drivers/misc/sony-laptop.c | 5 +++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 12a2f3b28829..53bea688221a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de47b69c7b7be46b0848b2c4f8e23c478cd68690
+refs/heads/master: e84a02ba0b33a97a8486f3248fd45f50b1a1c014
diff --git a/trunk/drivers/acpi/asus_acpi.c b/trunk/drivers/acpi/asus_acpi.c
index 86fd142f4bf3..9c4bd220c44f 100644
--- a/trunk/drivers/acpi/asus_acpi.c
+++ b/trunk/drivers/acpi/asus_acpi.c
@@ -1192,7 +1192,6 @@ static int asus_hotk_get_info(void)
 			break;
 		default:
 			kfree(model);
-			model = NULL;
 			break;
 		}
 	}
diff --git a/trunk/drivers/misc/sony-laptop.c b/trunk/drivers/misc/sony-laptop.c
index 14ee06c8f127..9a803e13c307 100644
--- a/trunk/drivers/misc/sony-laptop.c
+++ b/trunk/drivers/misc/sony-laptop.c
@@ -942,6 +942,11 @@ static int sony_nc_resume(struct acpi_device *device)
 		}
 	}
 
+	/* set the last requested brightness level */
+	if (sony_backlight_device &&
+			!sony_backlight_update_status(sony_backlight_device))
+		printk(KERN_WARNING DRV_PFX "unable to restore brightness level");
+
 	/* re-initialize models with specific requirements */
 	dmi_check_system(sony_nc_ids);