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 <[email protected]>
Signed-off-by: Jean Tourrilhes <[email protected]>
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)
Jean Tourrilhes <[email protected]> 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 <[email protected]>
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 <[email protected]>
Signed-off-by: Jean Tourrilhes <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
---
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);
_
On Wed, Oct 20, 2004 at 03:53:49PM -0700, Andrew Morton wrote:
> Jean Tourrilhes <[email protected]> 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
On Wed, 20 Oct 2004 15:54:18 -0700
Jean Tourrilhes <[email protected]> wrote:
> On Wed, Oct 20, 2004 at 03:53:49PM -0700, Andrew Morton wrote:
> > Jean Tourrilhes <[email protected]> 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?
"David S. Miller" <[email protected]> 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.
> "David S. Miller" <[email protected]> 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.