* [PATCH 2.6 IrDA] Stir driver usb reset fix
@ 2004-10-20 1:07 Jean Tourrilhes
2004-10-20 22:53 ` Andrew Morton
0 siblings, 1 reply; 6+ messages in thread
From: Jean Tourrilhes @ 2004-10-20 1:07 UTC (permalink / raw)
To: David S. Miller, Linux kernel mailing list
irXXX_stir_reset.diff :
~~~~~~~~~~~~~~~~~~~~~
<Patch from Stephen Hemminger>
o [CORRECT] stir4200 - get rid of reset on speed change
The Sigmatel 4200 doesn't accept the address setting which gets done on
USB reset. The USB core recently changed to resend address (or
something like that), so usb_reset_device is failing.
The device works without doing the USB reset on speed change, it just
will be less robust in recovering when things get wedged (like coming
out of FIR mode).
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com>
diff -Nru a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c
--- a/drivers/net/irda/stir4200.c 2004-10-08 14:01:29 -07:00
+++ b/drivers/net/irda/stir4200.c 2004-10-08 14:01:29 -07:00
@@ -520,11 +520,6 @@
found:
pr_debug("speed change from %d to %d\n", stir->speed, speed);
- /* sometimes needed to get chip out of stuck state */
- err = usb_reset_device(stir->usbdev);
- if (err)
- goto out;
-
/* Reset modulator */
err = write_reg(stir, REG_CTRL1, CTRL1_SRESET);
if (err)
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 2.6 IrDA] Stir driver usb reset fix
2004-10-20 1:07 [PATCH 2.6 IrDA] Stir driver usb reset fix Jean Tourrilhes
@ 2004-10-20 22:53 ` Andrew Morton
2004-10-20 22:54 ` Jean Tourrilhes
0 siblings, 1 reply; 6+ messages in thread
From: Andrew Morton @ 2004-10-20 22:53 UTC (permalink / raw)
To: jt; +Cc: jt, davem, linux-kernel
Jean Tourrilhes <jt@bougret.hpl.hp.com> wrote:
>
> o [CORRECT] stir4200 - get rid of reset on speed change
> The Sigmatel 4200 doesn't accept the address setting which gets done on
> USB reset. The USB core recently changed to resend address (or
> something like that), so usb_reset_device is failing.
This needs fixups due to competing changes. Please review:
From: Jean Tourrilhes <jt@bougret.hpl.hp.com>
From: Stephen Hemminger
o [CORRECT] stir4200 - get rid of reset on speed change The Sigmatel 4200
doesn't accept the address setting which gets done on USB reset. The USB
core recently changed to resend address (or something like that), so
usb_reset_device is failing.
The device works without doing the USB reset on speed change, it just
will be less robust in recovering when things get wedged (like coming
out of FIR mode).
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/drivers/net/irda/stir4200.c | 3 ---
1 files changed, 3 deletions(-)
diff -puN drivers/net/irda/stir4200.c~irda-stir-driver-usb-reset-fix drivers/net/irda/stir4200.c
--- 25/drivers/net/irda/stir4200.c~irda-stir-driver-usb-reset-fix Wed Oct 20 15:51:39 2004
+++ 25-akpm/drivers/net/irda/stir4200.c Wed Oct 20 15:52:50 2004
@@ -528,11 +528,8 @@ static int change_speed(struct stir_cb *
err = rc;
goto out;
}
- err = usb_reset_device(stir->usbdev);
if (rc)
usb_unlock_device(stir->usbdev);
- if (err)
- goto out;
/* Reset modulator */
err = write_reg(stir, REG_CTRL1, CTRL1_SRESET);
_
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2.6 IrDA] Stir driver usb reset fix
2004-10-20 22:53 ` Andrew Morton
@ 2004-10-20 22:54 ` Jean Tourrilhes
2004-10-21 4:09 ` David S. Miller
0 siblings, 1 reply; 6+ messages in thread
From: Jean Tourrilhes @ 2004-10-20 22:54 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: Andrew Morton, davem, linux-kernel
On Wed, Oct 20, 2004 at 03:53:49PM -0700, Andrew Morton wrote:
> Jean Tourrilhes <jt@bougret.hpl.hp.com> wrote:
> >
> > o [CORRECT] stir4200 - get rid of reset on speed change
> > The Sigmatel 4200 doesn't accept the address setting which gets done on
> > USB reset. The USB core recently changed to resend address (or
> > something like that), so usb_reset_device is failing.
>
> This needs fixups due to competing changes. Please review:
Stephen,
Do you want to take care of that and forward a new patch
directly to Andrew ?
Thanks...
Jean
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2.6 IrDA] Stir driver usb reset fix
2004-10-20 22:54 ` Jean Tourrilhes
@ 2004-10-21 4:09 ` David S. Miller
2004-10-21 4:29 ` Andrew Morton
0 siblings, 1 reply; 6+ messages in thread
From: David S. Miller @ 2004-10-21 4:09 UTC (permalink / raw)
To: jt; +Cc: jt, shemminger, akpm, linux-kernel
On Wed, 20 Oct 2004 15:54:18 -0700
Jean Tourrilhes <jt@bougret.hpl.hp.com> wrote:
> On Wed, Oct 20, 2004 at 03:53:49PM -0700, Andrew Morton wrote:
> > Jean Tourrilhes <jt@bougret.hpl.hp.com> wrote:
> > >
> > > o [CORRECT] stir4200 - get rid of reset on speed change
> > > The Sigmatel 4200 doesn't accept the address setting which gets done on
> > > USB reset. The USB core recently changed to resend address (or
> > > something like that), so usb_reset_device is failing.
> >
> > This needs fixups due to competing changes. Please review:
>
> Do you want to take care of that and forward a new patch
> directly to Andrew ?
Andrew/Jeff, I can work on the integration of all of Jean's
patches and I can also resolve all the conflicts myself.
Ok?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2.6 IrDA] Stir driver usb reset fix
2004-10-21 4:09 ` David S. Miller
@ 2004-10-21 4:29 ` Andrew Morton
2004-10-21 5:02 ` shemminger
0 siblings, 1 reply; 6+ messages in thread
From: Andrew Morton @ 2004-10-21 4:29 UTC (permalink / raw)
To: David S. Miller; +Cc: jt, jt, shemminger, linux-kernel
"David S. Miller" <davem@davemloft.net> wrote:
>
> > Do you want to take care of that and forward a new patch
> > directly to Andrew ?
>
> Andrew/Jeff, I can work on the integration of all of Jean's
> patches and I can also resolve all the conflicts myself.
Go wild - there's nothing particularly messy in there.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2.6 IrDA] Stir driver usb reset fix
2004-10-21 4:29 ` Andrew Morton
@ 2004-10-21 5:02 ` shemminger
0 siblings, 0 replies; 6+ messages in thread
From: shemminger @ 2004-10-21 5:02 UTC (permalink / raw)
To: Andrew Morton; +Cc: David S. Miller, jt, jt, shemminger, linux-kernel
> "David S. Miller" <davem@davemloft.net> wrote:
>>
>> > Do you want to take care of that and forward a new patch
>> > directly to Andrew ?
>>
>> Andrew/Jeff, I can work on the integration of all of Jean's
>> patches and I can also resolve all the conflicts myself.
>
> Go wild - there's nothing particularly messy in there.
I have one ready for AM tommorrow.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2004-10-21 5:23 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-10-20 1:07 [PATCH 2.6 IrDA] Stir driver usb reset fix Jean Tourrilhes
2004-10-20 22:53 ` Andrew Morton
2004-10-20 22:54 ` Jean Tourrilhes
2004-10-21 4:09 ` David S. Miller
2004-10-21 4:29 ` Andrew Morton
2004-10-21 5:02 ` shemminger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox