Hi,
this makes 2.4 hpusbscsi comply to the io_request_lock rules.
Regards
Oliver
You can import this changeset into BK by piping this whole message to:
'| bk receive [path to repository]' or apply the patch as usual.
===================================================================
[EMAIL PROTECTED], 2002-06-18 20:20:03+02:00, [EMAIL PROTECTED]
Confirm to stupid 2.4 rules on io_request_lock
diff -Nru a/drivers/usb/hpusbscsi.c b/drivers/usb/hpusbscsi.c
--- a/drivers/usb/hpusbscsi.c Tue Jun 18 20:20:27 2002
+++ b/drivers/usb/hpusbscsi.c Tue Jun 18 20:20:27 2002
@@ -40,6 +40,10 @@
* - Added Elite II scanner - bonzo
* - Cleaned up the debug statements and made them optional at load time - bonzo
*
+ * 20020618
+ *
+ * - Confirm to stupid 2.4 rules on io_request_lock
+ *
*/
#include <linux/module.h>
@@ -271,6 +275,7 @@
/* What a hideous hack! */
char local_name[48];
+ spin_unlock_irq(&io_request_lock);
/* set up the name of our subdirectory under /proc/scsi/ */
@@ -279,6 +284,7 @@
/* FIXME: where is this freed ? */
if (!sht->proc_name) {
+ spin_lock_irq(&io_request_lock);
return 0;
}
@@ -299,6 +305,7 @@
if ( 0 > usb_submit_urb(&desc->controlurb)) {
kfree(sht->proc_name);
+ spin_lock_irq(&io_request_lock);
return 0;
}
@@ -307,10 +314,11 @@
if (desc->host == NULL) {
kfree (sht->proc_name);
usb_unlink_urb(&desc->controlurb);
+ spin_lock_irq(&io_request_lock);
return 0;
}
desc->host->hostdata[0] = (unsigned long) desc;
-
+ spin_lock_irq(&io_request_lock);
return 1;
}
@@ -415,8 +423,11 @@
struct hpusbscsi* hpusbscsi = (struct hpusbscsi*)(srb->host->hostdata[0]);
PDEBUG(1, "Request is canceled");
+ spin_unlock_irq(&io_request_lock);
usb_unlink_urb(&hpusbscsi->dataurb);
hpusbscsi->state = HP_STATE_FREE;
+
+ spin_lock_irq(&io_request_lock);
return SCSI_ABORT_PENDING;
}
===================================================================
This BitKeeper patch contains the following changesets:
1.720
## Wrapped with gzip_uu ##
begin 664 bkpatch10205
M'XL(`.MY#ST``\54;6^;,!#^'/^*DRI-6RO@_`*&3)FRI=,:;=*B3/T<!7`+
M(L&I#>LF\>-G$BU[T8K2;M+`!OON\7'/W2/.X-HJ,Q[I3?E9&7(&5]HV;JMJ
M72N_T%NU*>OVBZ_-K7,NM7;.H#<'AQ-!6GF-4<H&]TP0!UFLFZP`Y['C$?7Y
MT=)\W:GQ:/GVW?6'UTM")A.8%>OZ5GU2#4PF)*VF>:LV?F7TNNB_UAW='4.D
M&")E7$3(.I1(PRZ2^5H*CDD8BIPJ2@[Y3/^4^:^Q&$8TQH1SSCJ>Q#(AET!]
MR1"0!1@%-`:&8S>07R`;(\)`:+B@X"%Y`W]/8$8RF.GZIC1;:#38IMV5.3!?
M@&DWRH*NH=0KH^Y:99O51F<5>0^.@(C)XD<QB??(BQ!<(WD%N[Y-TUS9ZB<.
MN>F9VZ"U:5#LW--FMO2S/2.*Z(J&(8LZ)F6"72Y5'N>YB/-4IBKB0W4;BKQO
M$(W=BG=NHMC+Y8$#O7C^?>J#:AI,/60A33CE4<>EE/%>6Y0^45H,//H?M>4J
M_Q$\<[\?3BF+AYKP!-'-!0-!X!R^-]RM^ZWWV#S=L3F3'"@9V5U9K]JZ-Z]*
M<_?\V6_8%R\=-*8]](`=1'(\'9F<AKQTPG#(^>%U0F1!Y:G$!$V`D=$)48__
7Y*Q0667;[23&FSAU-_D&SBI"]@\&````
`
end
----------------------------------------------------------------------------
Bringing you mounds of caffeinated joy
>>> http://thinkgeek.com/sf <<<
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
