---

yaml --- r: 63935 b: refs/heads/master c: e84a02b h: refs/heads/master i: 63933: 5a40c58 63931: 8b1f838 63927: 855ac97 63919: a1a6197 63903: 8056f58 63871: 831dcce v: v3
git-mirror · Aug 3, 2007 · ba2833d · ba2833d
1 parent 736ca3f
commit ba2833d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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);
-Original file line number
+Diff line change
@@ Expand Up / @@ -1192,7 +1192,6 @@ static int asus_hotk_get_info(void) @@
     			break;
     		default:
     			kfree(model);
-    			model = NULL;
     			break;
     		}
     	}
@@ Expand Down @@