Skip to contentSkip to conversation

Stir driver usb reset fix

PATCH In review Jean Tourrilhes 4 participants 6 messages Oct 20, 2004 – Oct 21, 2004 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Stir driver usb reset fix

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).

drivers/net/irda/stir4200.c +0 -5
diff -Nru a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c
@@ -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)
#1 lore raw
Quoted 5 lines · Jean Tourrilhes

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).

---

 25-akpm/drivers/net/irda/stir4200.c |    3 ---
 1 files changed, 3 deletions(-)
drivers/net/irda/stir4200.c renamed from drivers/net/irda/stir4200.c~irda-stir-driver-usb-reset-fix +0 -3
diff -puN drivers/net/irda/stir4200.c~irda-stir-driver-usb-reset-fix drivers/net/irda/stir4200.c
@@ -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);

_

#2 lore raw
Quoted 8 lines · Andrew Morton
Quoted 5 lines · Jean Tourrilhes

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
maintainer
#3 lore raw
Quoted 8 lines · On Wed, 20 Oct 2004 15:54:18 -0700 Jean Tourrilhes <[email protected]>…
Quoted 7 lines · Andrew Morton
Quoted 5 lines · Jean Tourrilhes

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.

Quoted 4 lines
Quoted 1 line

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?

#4 lore raw
Quoted 6 lines · David S. Miller
Quoted 3 lines

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.

#5 lore raw
Quoted 9 lines
Quoted 6 lines · David S. Miller
Quoted 3 lines

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.