Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git/ (e6600d80) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/usb/core/message.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -431,7 +431,7 @@ int usb_sg_init (
		* (2) error, where io->status is a negative errno value. The number
		* of io->bytes transferred before the error is usually less
		* than requested, and can be nonzero.
		* (3) cancelation, a type of error with status -ECONNRESET that
		* (3) cancellation, a type of error with status -ECONNRESET that
		* is initiated by usb_sg_cancel().
		*
		* When this function returns, all memory allocated through usb_sg_init() or
		@@ -1282,7 +1282,7 @@ static void release_interface(struct device *dev)
		* bus rwsem; usb device driver probe() methods cannot use this routine.
		*
		* Returns zero on success, or else the status code returned by the
		* underlying call that failed. On succesful completion, each interface
		* underlying call that failed. On successful completion, each interface
		* in the original device configuration has been destroyed, and each one
		* in the new configuration has been probed by all relevant usb device
		* drivers currently known to the kernel.

+3 −3

Original line number	Diff line number	Diff line
		@@ -121,7 +121,7 @@ struct urb * usb_get_urb(struct urb *urb)
		* describing that request to the USB subsystem. Request completion will
		* be indicated later, asynchronously, by calling the completion handler.
		* The three types of completion are success, error, and unlink
		* (a software-induced fault, also called "request cancelation").
		* (a software-induced fault, also called "request cancellation").
		*
		* URBs may be submitted in interrupt context.
		*
		@@ -170,7 +170,7 @@ struct urb * usb_get_urb(struct urb *urb)
		* As of Linux 2.6, all USB endpoint transfer queues support depths greater
		* than one. This was previously a HCD-specific behavior, except for ISO
		* transfers. Non-isochronous endpoint queues are inactive during cleanup
		* after faults (transfer errors or cancelation).
		* after faults (transfer errors or cancellation).
		*
		* Reserved Bandwidth Transfers:
		*
		@@ -395,7 +395,7 @@ int usb_submit_urb(struct urb *urb, int mem_flags)
		*
		* This routine cancels an in-progress request. URBs complete only
		* once per submission, and may be canceled only once per submission.
		* Successful cancelation means the requests's completion handler will
		* Successful cancellation means the requests's completion handler will
		* be called with a status code indicating that the request has been
		* canceled (rather than any other code) and will quickly be removed
		* from host controller data structures.

+1 −1

Original line number	Diff line number	Diff line
		@@ -569,7 +569,7 @@ static const struct usb_cdc_ether_desc ether_desc = {

		/* include the status endpoint if we can, even where it's optional.
		* use wMaxPacketSize big enough to fit CDC_NOTIFY_SPEED_CHANGE in one
		* packet, to simplify cancelation; and a big transfer interval, to
		* packet, to simplify cancellation; and a big transfer interval, to
		* waste less bandwidth.
		*
		* some drivers (like Linux 2.4 cdc-ether!) "need" it to exist even

+1 −1

Original line number	Diff line number	Diff line
		@@ -275,7 +275,7 @@ static const char *CHIP;
		*
		* After opening, configure non-control endpoints. Then use normal
		* stream read() and write() requests; and maybe ioctl() to get more
		* precise FIFO status when recovering from cancelation.
		* precise FIFO status when recovering from cancellation.
		*/

		static void epio_complete (struct usb_ep ep, struct usb_request req)

+1 −1

Original line number	Diff line number	Diff line
		@@ -705,7 +705,7 @@ void nuke(struct lh7a40x_ep *ep, int status)
		done(ep, req, status);
		}

		/* Disable IRQ if EP is enabled (has decriptor) */
		/* Disable IRQ if EP is enabled (has descriptor) */
		if (ep->desc)
		pio_irq_disable(ep_index(ep));
		}