diff --git a/[refs] b/[refs]
index 4804a6221cfa..f69db5b20f64 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94f8d28c47aa425cbcaa4ca7fc7935cd0ddb0151
+refs/heads/master: 5fc4e6e197c7e377f1c8ebec727d40df983aceed
diff --git a/trunk/drivers/misc/ibmasm/remote.c b/trunk/drivers/misc/ibmasm/remote.c
index 1abd0c58ae27..0f9e3aa34d07 100644
--- a/trunk/drivers/misc/ibmasm/remote.c
+++ b/trunk/drivers/misc/ibmasm/remote.c
@@ -270,6 +270,7 @@ int ibmasm_init_remote_input_dev(struct service_processor *sp)
 
  err_unregister_mouse_dev:
 	input_unregister_device(mouse_dev);
+	mouse_dev = NULL; /* so we don't try to free it again below */
  err_free_devices:
 	input_free_device(mouse_dev);
 	input_free_device(keybd_dev);