diff --git a/[refs] b/[refs]
index d16c0c894024..93d7748009d1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b5fee5952ff7eb6ff7a64247a01040b8b331b74
+refs/heads/master: d399d130c82a1e1751b7770944f487fbd8b6272a
diff --git a/trunk/drivers/acpi/scan.c b/trunk/drivers/acpi/scan.c
index d9b914303b9c..3fac011f9cf9 100644
--- a/trunk/drivers/acpi/scan.c
+++ b/trunk/drivers/acpi/scan.c
@@ -609,8 +609,7 @@ acpi_bus_get_ejd(acpi_handle handle, acpi_handle *ejd)
 	status = acpi_evaluate_object(handle, "_EJD", NULL, &buffer);
 	if (ACPI_SUCCESS(status)) {
 		obj = buffer.pointer;
-		status = acpi_get_handle(ACPI_ROOT_OBJECT, obj->string.pointer,
-					 ejd);
+		status = acpi_get_handle(NULL, obj->string.pointer, ejd);
 		kfree(buffer.pointer);
 	}
 	return status;
diff --git a/trunk/drivers/misc/sony-laptop.c b/trunk/drivers/misc/sony-laptop.c
index 899e3f75f288..02ff3d19b1cc 100644
--- a/trunk/drivers/misc/sony-laptop.c
+++ b/trunk/drivers/misc/sony-laptop.c
@@ -315,7 +315,7 @@ static void sony_laptop_report_input_event(u8 event)
 		break;
 
 	default:
-		if (event > ARRAY_SIZE(sony_laptop_input_index)) {
+		if (event >= ARRAY_SIZE(sony_laptop_input_index)) {
 			dprintk("sony_laptop_report_input_event, event not known: %d\n", event);
 			break;
 		}