linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-kernel@vger.kernel.org, linux-input@vger.kernel.org,
	Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Subject: [PATCH 1/3] Input: db9 - store object at correct index
Date: Fri,  2 Oct 2015 16:58:33 +0530	[thread overview]
Message-ID: <1443785315-31495-1-git-send-email-sudipm.mukherjee@gmail.com> (raw)

The variable i is used to check the port to attach to and we are
supposed to save the reference of struct db9 in the location given by
db9_base[i]. But after finding out the index i is getting modified again
so we saved in a wrong index.

Fixes: 2260c419b52b ("Input: db9 - use parallel port device model")
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
 drivers/input/joystick/db9.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/input/joystick/db9.c b/drivers/input/joystick/db9.c
index cf1f602..f6ecd4a 100644
--- a/drivers/input/joystick/db9.c
+++ b/drivers/input/joystick/db9.c
@@ -560,7 +560,7 @@ static void db9_attach(struct parport *pp)
 	const struct db9_mode_data *db9_mode;
 	struct pardevice *pd;
 	struct input_dev *input_dev;
-	int i, j;
+	int i, j, k;
 	int mode;
 	struct pardev_cb db9_parport_cb;
 
@@ -577,6 +577,7 @@ static void db9_attach(struct parport *pp)
 		pr_debug("Not using parport%d.\n", pp->number);
 		return;
 	}
+	k = i;
 
 	mode = db9_cfg[i].args[DB9_ARG_MODE];
 
@@ -649,7 +650,7 @@ static void db9_attach(struct parport *pp)
 			goto err_free_dev;
 	}
 
-	db9_base[i] = db9;
+	db9_base[k] = db9;
 	return;
 
  err_free_dev:
@@ -676,6 +677,7 @@ static void db9_detach(struct parport *port)
 		return;
 
 	db9 = db9_base[i];
+	db9_base[i] = NULL;
 
 	for (i = 0; i < min(db9_modes[db9->mode].n_pads, DB9_MAX_DEVICES); i++)
 		input_unregister_device(db9->dev[i]);
-- 
1.9.1


             reply	other threads:[~2015-10-02 11:28 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-02 11:28 Sudip Mukherjee [this message]
2015-10-02 11:28 ` [PATCH 2/3] Input: gamecon - store object at correct index Sudip Mukherjee
2015-10-02 11:28 ` [PATCH 3/3] Input: turbografx - store object in " Sudip Mukherjee
2015-10-02 18:11 ` [PATCH 1/3] Input: db9 - store object at " Dmitry Torokhov
2015-10-03  5:44   ` Sudip Mukherjee

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1443785315-31495-1-git-send-email-sudipm.mukherjee@gmail.com \
    --to=sudipm.mukherjee@gmail.com \
    --cc=dmitry.torokhov@gmail.com \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).