On Fri 30 May 2003 19:31, Greg KH wrote:
> Can you re-diff this for 2.5.70, this patch doesn't apply there, due to
> some changes in the same area.
why not.
> thanks,
>
> greg k-h
--- linux-2.5.70/drivers/usb/misc/rio500.c 2003-05-31 20:48:50.000000000 +0200
+++ linux-2.5.70-diff/drivers/usb/misc/rio500.c 2003-05-31 21:28:17.000000000 +0200
@@ -23,6 +23,9 @@
*
* Based upon mouse.c (Brad Keryan) and printer.c (Michael Gee).
*
+ * Changelog:
+ * 30/05/2003 replaced lock/unlock kernel with up/down
+ * Daniele Bellucci [EMAIL PROTECTED]
* */
#include <linux/module.h>
@@ -75,17 +78,17 @@
{
struct rio_usb_data *rio = &rio_instance;
- lock_kernel();
+ down(&(rio->lock));
if (rio->isopen || !rio->present) {
- unlock_kernel();
+ up(&(rio->lock));
return -EBUSY;
}
rio->isopen = 1;
init_waitqueue_head(&rio->wait_q);
- unlock_kernel();
+ up(&(rio->lock));
info("Rio opened.");
@@ -460,7 +463,6 @@
return -ENOMEM;
}
- rio->present = 1;
rio->rio_dev = dev;
if (!(rio->obuf = (char *) kmalloc(OBUF_SIZE, GFP_KERNEL))) {
@@ -481,6 +483,8 @@
init_MUTEX(&(rio->lock));
usb_set_intfdata (intf, rio);
+ rio->present = 1;
+
return 0;
}
@@ -524,7 +528,7 @@
.id_table = rio_table,
};
-int usb_rio_init(void)
+static int __init usb_rio_init(void)
{
if (usb_register(&rio_driver) < 0)
return -1;
@@ -535,7 +539,7 @@
}
-void usb_rio_cleanup(void)
+static void __exit usb_rio_cleanup(void)
{
struct rio_usb_data *rio = &rio_instance;
Greg,
plese apply.
Thanx.
-------------------------------------------------------------------------------------------------------------------------------------------------------------
PGP PKEY http://pgp.mit.edu:11371/pks/[EMAIL PROTECTED]&op=index
ICQ# 104896040
Netphone/Fax 178.605.7063
Homepage http://web.tiscali.it/bellucda
-------------------------------------------------------------------------------------------------------------------------------------------------------------
Daniele Bellucci
-------------------------------------------------------
This SF.net email is sponsored by: eBay
Get office equipment for less on eBay!
http://adfarm.mediaplex.com/ad/ck/711-11697-6916-5
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
