From 0e2a4fd2e8c48ba5eb386d5698846a5ca0c80f39 Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Mon, 28 May 2007 23:24:39 -0400 Subject: Input: db9 - do not ignore dev2 module parameter Because of incorrect parameter setup anything passed in dev2=... was always ignored by the driver. See bugzilla #8541. Signed-off-by: Dmitry Torokhov --- drivers/input/joystick/db9.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/input/joystick/db9.c b/drivers/input/joystick/db9.c index 86ad1027e12a..b069ee18e353 100644 --- a/drivers/input/joystick/db9.c +++ b/drivers/input/joystick/db9.c @@ -54,7 +54,7 @@ static struct db9_config db9_cfg[DB9_MAX_PORTS] __initdata; module_param_array_named(dev, db9_cfg[0].args, int, &db9_cfg[0].nargs, 0); MODULE_PARM_DESC(dev, "Describes first attached device (,)"); -module_param_array_named(dev2, db9_cfg[1].args, int, &db9_cfg[0].nargs, 0); +module_param_array_named(dev2, db9_cfg[1].args, int, &db9_cfg[1].nargs, 0); MODULE_PARM_DESC(dev2, "Describes second attached device (,)"); module_param_array_named(dev3, db9_cfg[2].args, int, &db9_cfg[2].nargs, 0); MODULE_PARM_DESC(dev3, "Describes third attached device (,)"); -- cgit v1.2.3 From b23c9e386cc639aa7c0b7360388b3e3759059e06 Mon Sep 17 00:00:00 2001 From: Uwe Bugla Date: Mon, 28 May 2007 23:24:48 -0400 Subject: Input: logips2pp - fix typo in Kconfig Signed-off-by: Uwe Bugla Signed-off-by: Dmitry Torokhov --- drivers/input/mouse/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig index 2ccc114b3ff6..2682a7d6cb45 100644 --- a/drivers/input/mouse/Kconfig +++ b/drivers/input/mouse/Kconfig @@ -48,7 +48,7 @@ config MOUSE_PS2_ALPS If unsure, say Y. config MOUSE_PS2_LOGIPS2PP - bool "Logictech PS/2++ mouse protocol extension" if EMBEDDED + bool "Logitech PS/2++ mouse protocol extension" if EMBEDDED default y depends on MOUSE_PS2 help -- cgit v1.2.3 From 26be5a509af5f80c7012bd4f0478a94746c9c9d9 Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Fri, 11 May 2007 01:16:12 -0400 Subject: Input: ucb1x00 - do not access input_dev->private directly Use input_get_drvdata() and input_set_drvdata() helpers to do that. Signed-off-by: Dmitry Torokhov Acked-by: Pavel Machek --- drivers/mfd/ucb1x00-ts.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/mfd/ucb1x00-ts.c b/drivers/mfd/ucb1x00-ts.c index b023eae3c3ec..2d03bf791ceb 100644 --- a/drivers/mfd/ucb1x00-ts.c +++ b/drivers/mfd/ucb1x00-ts.c @@ -292,7 +292,7 @@ static void ucb1x00_ts_irq(int idx, void *id) static int ucb1x00_ts_open(struct input_dev *idev) { - struct ucb1x00_ts *ts = idev->private; + struct ucb1x00_ts *ts = input_get_drvdata(idev); int ret = 0; BUG_ON(ts->rtask); @@ -329,7 +329,7 @@ static int ucb1x00_ts_open(struct input_dev *idev) */ static void ucb1x00_ts_close(struct input_dev *idev) { - struct ucb1x00_ts *ts = idev->private; + struct ucb1x00_ts *ts = input_get_drvdata(idev); if (ts->rtask) kthread_stop(ts->rtask); @@ -381,7 +381,6 @@ static int ucb1x00_ts_add(struct ucb1x00_dev *dev) ts->idev = idev; ts->adcsync = adcsync ? UCB_SYNC : UCB_NOSYNC; - idev->private = ts; idev->name = "Touchscreen panel"; idev->id.product = ts->ucb->id; idev->open = ucb1x00_ts_open; @@ -392,6 +391,8 @@ static int ucb1x00_ts_add(struct ucb1x00_dev *dev) __set_bit(ABS_Y, idev->absbit); __set_bit(ABS_PRESSURE, idev->absbit); + input_set_drvdata(idev, ts); + err = input_register_device(idev); if (err) goto fail; -- cgit v1.2.3 From 1dfa2812404c37d7571622195f907cea3331616c Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Sun, 3 Jun 2007 23:29:36 -0400 Subject: Input: reduce raciness when input handlers disconnect There is a race between input handler's release() and disconnect() methods: when input handler disconnects it wakes up all regular users and then process to walk user list to wake up async. users. While disconnect() walks the list release() removes elements of the same list causing oopses. While this is not a substibute for proper locking we can reduce odds of getting an oops if we wake up normal readers after walking the list. Signed-off-by: Dmitry Torokhov --- drivers/input/evdev.c | 2 +- drivers/input/joydev.c | 2 +- drivers/input/mousedev.c | 2 +- drivers/input/tsdev.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index a4c3729d3960..93b407cd4600 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c @@ -700,9 +700,9 @@ static void evdev_disconnect(struct input_handle *handle) if (evdev->open) { input_flush_device(handle, NULL); input_close_device(handle); - wake_up_interruptible(&evdev->wait); list_for_each_entry(client, &evdev->client_list, node) kill_fasync(&client->fasync, SIGIO, POLL_HUP); + wake_up_interruptible(&evdev->wait); } else evdev_free(evdev); } diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c index 9bcc5425049b..c83bfe8914ac 100644 --- a/drivers/input/joydev.c +++ b/drivers/input/joydev.c @@ -595,9 +595,9 @@ static void joydev_disconnect(struct input_handle *handle) if (joydev->open) { input_close_device(handle); - wake_up_interruptible(&joydev->wait); list_for_each_entry(client, &joydev->client_list, node) kill_fasync(&client->fasync, SIGIO, POLL_HUP); + wake_up_interruptible(&joydev->wait); } else joydev_free(joydev); } diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c index 7678e9876550..dc78f62cbee1 100644 --- a/drivers/input/mousedev.c +++ b/drivers/input/mousedev.c @@ -767,9 +767,9 @@ static void mousedev_disconnect(struct input_handle *handle) if (mousedev->open) { input_close_device(handle); - wake_up_interruptible(&mousedev->wait); list_for_each_entry(client, &mousedev->client_list, node) kill_fasync(&client->fasync, SIGIO, POLL_HUP); + wake_up_interruptible(&mousedev->wait); } else mousedev_free(mousedev); } diff --git a/drivers/input/tsdev.c b/drivers/input/tsdev.c index 5e5b5c91d75b..af4581d00d82 100644 --- a/drivers/input/tsdev.c +++ b/drivers/input/tsdev.c @@ -477,9 +477,9 @@ static void tsdev_disconnect(struct input_handle *handle) if (tsdev->open) { input_close_device(handle); - wake_up_interruptible(&tsdev->wait); list_for_each_entry(client, &tsdev->client_list, node) kill_fasync(&client->fasync, SIGIO, POLL_HUP); + wake_up_interruptible(&tsdev->wait); } else tsdev_free(tsdev); } -- cgit v1.2.3