* [PATCH 1/3] Input: db9 - store object at correct index
@ 2015-10-02 11:28 Sudip Mukherjee
2015-10-02 11:28 ` [PATCH 2/3] Input: gamecon " Sudip Mukherjee
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Sudip Mukherjee @ 2015-10-02 11:28 UTC (permalink / raw)
To: Dmitry Torokhov; +Cc: linux-kernel, linux-input, Sudip Mukherjee
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] Input: gamecon - store object at correct index
2015-10-02 11:28 [PATCH 1/3] Input: db9 - store object at correct index Sudip Mukherjee
@ 2015-10-02 11:28 ` 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
2 siblings, 0 replies; 5+ messages in thread
From: Sudip Mukherjee @ 2015-10-02 11:28 UTC (permalink / raw)
To: Dmitry Torokhov; +Cc: linux-kernel, linux-input, Sudip Mukherjee, Dan Carpenter
The variable i is used to check the port to attach to and we are
supposed to save the reference of struct gc in the location given by
gc_base[i]. But after finding out the index i is getting modified again
so we saved in a wrong index.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Fixes: a517e87c3dfc ("Input: gamecon - use parallel port device model")
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
drivers/input/joystick/gamecon.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/input/joystick/gamecon.c b/drivers/input/joystick/gamecon.c
index 394ccbe..0f1f1c4 100644
--- a/drivers/input/joystick/gamecon.c
+++ b/drivers/input/joystick/gamecon.c
@@ -931,7 +931,7 @@ static void gc_attach(struct parport *pp)
{
struct gc *gc;
struct pardevice *pd;
- int i;
+ int i, j;
int count = 0;
int *pads, n_pads;
struct pardev_cb gc_parport_cb;
@@ -948,6 +948,7 @@ static void gc_attach(struct parport *pp)
pr_debug("Not using parport%d.\n", pp->number);
return;
}
+ j = i;
pads = gc_cfg[i].args + 1;
n_pads = gc_cfg[i].nargs - 1;
@@ -985,7 +986,7 @@ static void gc_attach(struct parport *pp)
goto err_free_gc;
}
- gc_base[i] = gc;
+ gc_base[j] = gc;
return;
err_unreg_devs:
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] Input: turbografx - store object in correct index
2015-10-02 11:28 [PATCH 1/3] Input: db9 - store object at correct index Sudip Mukherjee
2015-10-02 11:28 ` [PATCH 2/3] Input: gamecon " Sudip Mukherjee
@ 2015-10-02 11:28 ` Sudip Mukherjee
2015-10-02 18:11 ` [PATCH 1/3] Input: db9 - store object at " Dmitry Torokhov
2 siblings, 0 replies; 5+ messages in thread
From: Sudip Mukherjee @ 2015-10-02 11:28 UTC (permalink / raw)
To: Dmitry Torokhov; +Cc: linux-kernel, linux-input, Sudip Mukherjee
The variable i is used to check the port to attach to and we are
supposed to save the reference of struct tgfx in the location given by
tgfx_base[i]. But after finding out the index i is getting modified again
so we saved in a wrong index.
Fixes: 4de27a638a99 ("Input: turbografx - use parallel port device model")
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
drivers/input/joystick/turbografx.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/input/joystick/turbografx.c b/drivers/input/joystick/turbografx.c
index 01e8ea9..dc62d58 100644
--- a/drivers/input/joystick/turbografx.c
+++ b/drivers/input/joystick/turbografx.c
@@ -162,7 +162,7 @@ static void tgfx_attach(struct parport *pp)
struct tgfx *tgfx;
struct input_dev *input_dev;
struct pardevice *pd;
- int i, j;
+ int i, j, k;
int *n_buttons, n_devs;
struct pardev_cb tgfx_parport_cb;
@@ -177,6 +177,7 @@ static void tgfx_attach(struct parport *pp)
pr_debug("Not using parport%d.\n", pp->number);
return;
}
+ k = i;
n_buttons = tgfx_cfg[i].args + 1;
n_devs = tgfx_cfg[i].nargs - 1;
@@ -250,7 +251,7 @@ static void tgfx_attach(struct parport *pp)
goto err_free_tgfx;
}
- tgfx_base[i] = tgfx;
+ tgfx_base[k] = tgfx;
return;
err_free_dev:
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/3] Input: db9 - store object at correct index
2015-10-02 11:28 [PATCH 1/3] Input: db9 - store object at correct index Sudip Mukherjee
2015-10-02 11:28 ` [PATCH 2/3] Input: gamecon " Sudip Mukherjee
2015-10-02 11:28 ` [PATCH 3/3] Input: turbografx - store object in " Sudip Mukherjee
@ 2015-10-02 18:11 ` Dmitry Torokhov
2015-10-03 5:44 ` Sudip Mukherjee
2 siblings, 1 reply; 5+ messages in thread
From: Dmitry Torokhov @ 2015-10-02 18:11 UTC (permalink / raw)
To: Sudip Mukherjee; +Cc: linux-kernel, linux-input
Hi Sudip,
On Fri, Oct 02, 2015 at 04:58:33PM +0530, Sudip Mukherjee wrote:
> 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;
Hmm, I'd prefer we did not reuse 'i' at all. Can we instead of 'k' add
'port_idx' and use it instead of 'i' in the first loop?
Thanks.
--
Dmitry
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/3] Input: db9 - store object at correct index
2015-10-02 18:11 ` [PATCH 1/3] Input: db9 - store object at " Dmitry Torokhov
@ 2015-10-03 5:44 ` Sudip Mukherjee
0 siblings, 0 replies; 5+ messages in thread
From: Sudip Mukherjee @ 2015-10-03 5:44 UTC (permalink / raw)
To: Dmitry Torokhov; +Cc: linux-kernel, linux-input
On Fri, Oct 02, 2015 at 11:11:18AM -0700, Dmitry Torokhov wrote:
> Hi Sudip,
>
> On Fri, Oct 02, 2015 at 04:58:33PM +0530, Sudip Mukherjee wrote:
> > 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;
>
> Hmm, I'd prefer we did not reuse 'i' at all. Can we instead of 'k' add
> 'port_idx' and use it instead of 'i' in the first loop?
Yes, that will be great. This reuse of i caused this mistake. Sorry
about that I should have been more carefull.
regards
sudip
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-10-03 5:44 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-02 11:28 [PATCH 1/3] Input: db9 - store object at correct index Sudip Mukherjee
2015-10-02 11:28 ` [PATCH 2/3] Input: gamecon " 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
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).