Skip to contentSkip to conversation

Replaces (2 * HZ) with DATA_TIMEOUT in /drivers/usb/atm/speedtch.c

PATCH In review Telemaque Ndizihiwe 3 participants 3 messages Feb 23, 2005 – Feb 24, 2005

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Replaces (2 * HZ) with DATA_TIMEOUT in /drivers/usb/atm/speedtch.c

This Patch replaces "(2 * HZ)" with "DATA_TIMEOUT" which is defined as

    #define DATA_TIMEOUT (2 * HZ)

in /drivers/usb/atm/speedtch.c in kernel 2.6.10.

drivers/usb/atm/speedtch.c 2005-02-20 12:50:52.205983288 +0000 renamed from drivers/usb/atm/speedtch.c.orig 2005-02-20 12:44:22.235267848 +0000 +0 -0
@@ -494,7 +494,7 @@ static void speedtch_upload_firmware(str
    /* URB 7 */
    if (dl_512_first) {    /* some modems need a read before writing 

the firmware */
ret = usb_bulk_msg(usb_dev, usb_rcvbulkpipe(usb_dev,
SPEEDTCH_ENDPOINT_FIRMWARE),
- buffer, 0x200, &actual_length, 2 * HZ);
+ buffer, 0x200, &actual_length, DATA_TIMEOUT);

if (ret < 0 && ret != -ETIMEDOUT)
dbg("speedtch_upload_firmware: read BLOCK0 from modem
failed (%d)!", ret);

drivers/usb/atm/speedtch.c renamed from drivers/usb/atm/speedtch.c.orig +1 -1
@@ -494,7 +494,7 @@ static void speedtch_upload_firmware(str
 	/* URB 7 */
 	if (dl_512_first) {	/* some modems need a read before writing the firmware */
 		ret = usb_bulk_msg(usb_dev, usb_rcvbulkpipe(usb_dev, SPEEDTCH_ENDPOINT_FIRMWARE),
-				   buffer, 0x200, &actual_length, 2 * HZ);
+				   buffer, 0x200, &actual_length, DATA_TIMEOUT);
 
 		if (ret < 0 && ret != -ETIMEDOUT)
 			dbg("speedtch_upload_firmware: read BLOCK0 from modem failed (%d)!", ret);
#1 lore raw
Quoted 4 lines · Telemaque Ndizihiwe

This Patch replaces "(2 * HZ)" with "DATA_TIMEOUT" which is defined as

     #define DATA_TIMEOUT (2 * HZ)

in /drivers/usb/atm/speedtch.c in kernel 2.6.10.

Your patches are white-space damaged due to linewrap (and possibly other issues, but the line-wrap was the obvious one).

Looks like you use Thunderbird, and I'm sure there's some way to just tell it to not mess with whitespace.

Linus

#2 lore raw
In reply to Telemaque Ndizihiwe
Quoted 5 lines · Telemaque Ndizihiwe

This Patch replaces "(2 * HZ)" with "DATA_TIMEOUT" which is defined as

    #define DATA_TIMEOUT (2 * HZ)

in /drivers/usb/atm/speedtch.c in kernel 2.6.10.

This has already been fixed in my tree, due to the change in time value for the usb_bulk_msg() call. See the latest -mm release to validate this.

thanks,

greg k-h