Introduces URB write locking macros.
Signed-off-by: Luiz Capitulino <[email protected]>
drivers/usb/serial/usb-serial.h | 37 ++++++++++++++++++++++++++++++++++++-
1 file changed, 36 insertions(+), 1 deletion(-)
diff -Nparu -X /home/lcapitulino/kernels/dontdiff a/drivers/usb/serial/usb-serial.h a~/drivers/usb/serial/usb-serial.h
--- a/drivers/usb/serial/usb-serial.h 2005-12-04 20:05:26.000000000 -0200
+++ a~/drivers/usb/serial/usb-serial.h 2005-12-04 20:06:53.000000000 -0200
@@ -17,6 +17,7 @@
#include <linux/config.h>
#include <linux/kref.h>
#include <asm/semaphore.h>
+#include <asm/atomic.h>
#define SERIAL_TTY_MAJOR 188 /* Nice legal number now */
#define SERIAL_TTY_MINORS 255 /* loads of devices :) */
@@ -83,7 +84,7 @@ struct usb_serial_port {
unsigned char * bulk_out_buffer;
int bulk_out_size;
struct urb * write_urb;
- int write_urb_busy;
+ atomic_t write_urb_busy;
__u8 bulk_out_endpointAddress;
wait_queue_head_t write_wait;
@@ -104,6 +105,40 @@ static inline void usb_set_serial_port_d
dev_set_drvdata(&port->dev, data);
}
+/*
+ * usb_serial URB write access locking functions
+ *
+ * Protects 'write_urb_busy' member access, used to avoid two or more threads
+ * trying to write the same URB at the same time.
+ */
+
+/* Initialize the lock */
+static inline void usb_serial_write_urb_lock_init(struct usb_serial_port *port)
+{
+ atomic_set(&port->write_urb_busy, 0);
+}
+
+/*
+ * Lock function: returns zero if the lock was acquired,
+ * and non-zero otherwise
+ */
+static inline int usb_serial_write_urb_lock(struct usb_serial_port *port)
+{
+ return !atomic_add_unless(&port->write_urb_busy, 1, 1);
+}
+
+/* unlock function */
+static inline void usb_serial_write_urb_unlock(struct usb_serial_port *port)
+{
+ atomic_set(&port->write_urb_busy, 0);
+}
+
+/* Lock test: returns non-zero if the port is locked, and zero otherwise */
+static inline int usb_serial_write_urb_locked(struct usb_serial_port *port)
+{
+ return atomic_read(&port->write_urb_busy);
+}
+
/**
* usb_serial - structure used by the usb-serial core for a device
* @dev: pointer to the struct usb_device for this device
--
Luiz Fernando N. Capitulino
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
