From: Dmitry Torokhov <dtor_core@ameritech.net>
Date: Tue, 10 Jan 2006 07:00:39 +0000 (-0500)
Subject: Input: ibmasm - fix input initialization error path
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5fc4e6e197c7e377f1c8ebec727d40df983aceed;p=linux-beck.git

Input: ibmasm - fix input initialization error path

Do not try to free device that has already been unregistered,
input_unregister_device() frees it automatically.

Spotted by Vernon Mauery <vernux@us.ibm.com>

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---

diff --git a/drivers/misc/ibmasm/remote.c b/drivers/misc/ibmasm/remote.c
index 1abd0c58ae27..0f9e3aa34d07 100644
--- a/drivers/misc/ibmasm/remote.c
+++ b/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);