Maybe I'm stupid but take a look at this (and I have a sources of 2.6.12-rc4 -
downloaded fresh yesterday = I check even makefile header)
[EMAIL PROTECTED] linux]$ patch -p1 < patch1
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- drivers/usb/storage/transport.c 2005-03-14 00:33:16 -05:00
|+++ drivers/usb/storage/transport.c 2005-03-30 16:33:19 -05:00
--------------------------
File to patch:
[EMAIL PROTECTED] linux]$ patch -p0 < patch1
patching file drivers/usb/storage/transport.c
Hunk #1 FAILED at 266.
Hunk #2 FAILED at 1125.
Hunk #3 FAILED at 1146.
patch unexpectedly ends in middle of line
Hunk #4 FAILED at 1170.
4 out of 4 hunks FAILED -- saving rejects to file
drivers/usb/storage/transport.c.rej
[EMAIL PROTECTED] linux]$ cat patch1
--- drivers/usb/storage/transport.c 2005-03-14 00:33:16 -05:00
+++ drivers/usb/storage/transport.c 2005-03-30 16:33:19 -05:00
@@ -266,8 +266,9 @@
NULL, 0, 3*HZ);
/* reset the endpoint toggle */
- usb_settoggle(us->pusb_dev, usb_pipeendpoint(pipe),
- usb_pipeout(pipe), 0);
+ if (result >= 0)
+ usb_settoggle(us->pusb_dev, usb_pipeendpoint(pipe),
+ usb_pipeout(pipe), 0);
US_DEBUGP("%s: result = %d\n", __FUNCTION__, result);
return result;
@@ -1124,7 +1125,7 @@
* It's handy that every transport mechanism uses the control endpoint for
* resets.
*
- * Basically, we send a reset with a 20-second timeout, so we don't get
+ * Basically, we send a reset with a 5-second timeout, so we don't get
* jammed attempting to do the reset.
*/
static int usb_stor_reset_common(struct us_data *us,
@@ -1145,13 +1146,9 @@
clear_bit(US_FLIDX_ABORTING, &us->flags);
scsi_unlock(us_to_host(us));
- /* A 20-second timeout may seem rather long, but a LaCie
- * StudioDrive USB2 device takes 16+ seconds to get going
- * following a powerup or USB attach event.
- */
result = usb_stor_control_msg(us, us->send_ctrl_pipe,
request, requesttype, value, index, data, size,
- 20*HZ);
+ 5*HZ);
if (result < 0) {
US_DEBUGP("Soft reset failed: %d\n", result);
goto Done;
@@ -1173,8 +1170,10 @@
US_DEBUGP("Soft reset: clearing bulk-out endpoint halt\n");
result2 = usb_stor_clear_halt(us, us->send_bulk_pipe);
- /* return a result code based on the result of the control message */
- if (result < 0 || result2 < 0) {
+ /* return a result code based on the result of the clear-halts */
+ if (result >= 0)
+ result = result2;
+ if (result < 0) {
US_DEBUGP("Soft reset failed\n");
goto Done;
[EMAIL PROTECTED] linux]$
Regards
Artur
> Dnia piątek, 20 maja 2005 20:51, Alan Stern napisał:
> On Fri, 20 May 2005, Artur Szymiec wrote:
> > Dear Alan I try to apply this patches in the kernel 2.6.12-rc4
> > but patch -p0 rejects them - saying that chunk this or that was
> > rejected and saved to .rejected files ....
> >
> > Are this patches for 2.6.12-rc4 or make them manual ?
>
> The patches are for 2.6.12-rc4. I just tried them out and they worked
> fine. You're not supposed to use patch -p0; instead you should cd into
> the linux-2.6.12-rc4 top-level directory and use patch -p1.
>
> Alan Stern
>
>
>
> -------------------------------------------------------
> This SF.Net email is sponsored by Oracle Space Sweepstakes
> Want to be the first software developer in space?
> Enter now for the Oracle Space Sweepstakes!
> http://ads.osdn.com/?ad_id=7412&alloc_id=16344&op=click
> _______________________________________________
> [email protected]
> To unsubscribe, use the last form field at:
> https://lists.sourceforge.net/lists/listinfo/linux-usb-users
-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_idt12&alloc_id344&op=click
_______________________________________________
[email protected]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-users
